changes to allow window branch to build on OS X