Some fixes on collisions