iOS build fixes