Tweaks and hardenings