More non-universal mac changes