More error fixes
More error fixes