Finally fix building on OSX