Collisions small fixes