Fixing compile errors

Fixing compile errors