Patches to failing regression tests