Compability: Now compiles on OSX