Minor Mac build fixes from dx_rt merge