Fixes so that it once again builds in linux and os x