More error fixes