Yosemite DP4 Fixes

Minor quick fixes so it will still compile, some of this needs to be
handled more properly in the future