+ more error fixes