Fixed some issues on iphone