Fixes towards compatibility with Mac OS X Yosemite.