Minor changes thanks to the regression tests.