More fixes for OS X