Final edits for Mac OSX build