More hardening tweaks.