Tickets 1 and 6 resolved