Small manual corrections (due to new OSX support).