Fix some of the last collision bugs