(Apple) Build fixes to solutions