Small fixes for OS X Yosemite beta 6