Fix stuff for yosemite