Small Changes to Fix Ticket Bugs