Bugfixes for Mac OS X, etc.