Fix OSX build/warnings