Fixes after test run