Adjust to build with Mac OSX