Fixing compile errors (2)