Ticket Manager bug fix and cleanup