* Fixing compile errors