Even more collision fixes