*ProtectionModule: small improvements