Cancelled

Do attached fixes on iphone