More fixing compile errors

More fixing compile errors