collision tidy fixes