Small fixes Security Aggregator