OSX/Linux cleanup

Cutting down on changes needed in merge