Fixed all the 1023 errors