Ticket #48, 37, 45, 46 updates