Another round of iOS compile changes