Fixed several regression test problems