Minor fixes after test execution