more compile error fixes

this should be the last commit for compile time errors