Fixes to make 2.8.0 work on OS X