Minor fixes after test