Fixes for building on OS X 10.9