Still more fixes for problems on OS X 10.9
Merge pull request #233 from peastman/master

Still more fixes for problems on OS X 10.9