Some very minor fixes I found necessary on Mac OS X