Add more iOS specific changes