Fix issues on iDevices