More fixes to get it to compile