More error fixing