Commit from leftovers on ProjMac5