Fixed last of the errors found.