Collision fixes inbound still more needed (sadface)