Fix the Errors