Bit more work on prevening collisions at entry points