OSX build fixed
minor changes