Fix the rest of the errors