OSX10.9 fixes