Tweaks and hardening of logic