regression test fixes