Fixes for Yosemite.