Part 3.3: Last fixes before collision processing mechanism rewriting