(Apple/Location) Build fixes