Peruttu

Do attached fixes on iphone