regression test failure fixes