Fixes for Mac OS X 10.9