Yosemite Beta 2 Compatibility

Quick and dirty fixes ^_^