Auto checkin improvements