Fix the last four errors