Fix patches

the big merge to 1.23 clobbered our patches. This patch re-submits with conflicts fixed.