Collision Fixes