Fix collisions

Minor cleanups