(iOS) More buildfixes