Fix the error messages