Fixes for make test on OS X.