More fixes due to compile errors