Fixing compile errors