More fixes for Mac OS X.