auto_build: More hardening