Some fixes due the tests