A few fixes with collisions