Some fixes just before the test