More collision fixes