More fixing compile errors