Massive collision fixes