Some more error fixes