Minor changes, no features (trying to debug collisions)