Small fixes for OS X.