Fix the errors