some more error fixes