Bug fixes to reduce collisions