I'm sending the patches again as attachments since I think some of them
was badly formatted.