Fixes to conform to regression tests.