Minor bug fixes on collisions