A few more fixes of ios