Changes for OSX 10.9 support.