More safety tuning