Updated patches to work with the current trunk.