fixes for regression tests