more error fixes