changes to get build on osx working