Some fixes after the test