Fixes for regression tests

* Fixes some of the failing regression tests.