More changes to the Ticket client