Fixing compile errors from merges