Fix Credo warnings