Ticket handling modifications