fixing more compiling errors (hopefully not generating anothers)