OSX Template fixes
Merge pull request #497 from nickskull/develop-v3

OSX Template fixes