Core impact avoidness. 2.4 fixes