Fixing compile errors (4)