Fix some generation issues
Collisions