More fixes for build on older OSX