More fixes for problems on OS X 10.9
Merge pull request #225 from peastman/master

More fixes for problems on OS X 10.9