Some fixes in pegas/security-bundle