Several collision fixes on 000-1.