It now compiles on Mac OSX