Fix iOS issues