Changes to compile on OS X 10.9.