Minor tweaks after test runs.