Fix bad behaviours