Fix up hardening