Make warden pkgng bootstrap more robust