Try to get this to build on more platforms (especially Darwin)