Refresh patches

Patches now reflect current working trees.