Correct some values and restore adhoc "safety += 200" rule
I will test the modification/removal of that part of the code in a separate patch later.

bench: 8131146