more collision fixes