Fixing all compile errors from Merge