Tweaks to OSX build process and shortcommit stuffage