(Apple) Build fixes