0003-harden-and-fix-build
