[1.2.3] Hardening fixes