Updated patches to work with the latest trunk.