Support for OS X 10.10 DP3.

The attached commit fixes two known problems with Yosemite 10.10 OS X.