Initial fixes to get stuff working on Yosemite