Fixed a lot of errors for the 1.6.2 update