One more try at getting osx and linux both compiling