Minor fixes for Mac OS X