new collisions: assorted fixes