[PATCH 0/4] Small, assorted "hardening" fixes