Fixes for new collisions