Fixes for OSX 10.9 Mavericks