More error fixing.