More regression test fixes