Resolve all compile errors due to merge