Enhance hardening under buildflags