move some patches around