Changes to support OSX Builds