(iOS) More (attempted) buildfixes