Fixing things up after more testing on OS X