Minor fixes to compile