Fixes to iOS build