More regression test bug fixes