Some Patches from Ticket Tracker