- fixed various compilation issues