More error fixing..