warning & error fixes