More error fixes.