minor fixes to compile properly