Some fixes after test runs