Misc hardening