[PATCH v2 0/5] Small, assorted "hardening" fixes