More fixes to compile