Final fix for collisions issues

Final fix for collisions issues committed today.