Fixing compile errors from last check-in