minor fixes for collisionavoidance