OSX: Fixes to build