Ticket fixes