Add and disable some patches