diff --git a/headers/modsecurity/transaction/collection.h b/headers/modsecurity/transaction/collection.h
index 51e54d88..5b8b6515 100644
--- a/headers/modsecurity/transaction/collection.h
+++ b/headers/modsecurity/transaction/collection.h
@@ -32,6 +32,10 @@ class Collection : public transaction::Variables {
  public:
      Collection(std::string name, std::string key)
        : m_name(name),
+       m_persisted(false),
+       m_timeout(0),
+       m_updateCounter(0),
+       m_updateRate(0),
        m_key(key) { }
 
      std::string m_name;
diff --git a/test/optimization/optimization.cc b/test/optimization/optimization.cc
index 14f3e5ef..ef11882e 100644
--- a/test/optimization/optimization.cc
+++ b/test/optimization/optimization.cc
@@ -109,9 +109,7 @@ int main(int argc, char **argv) {
             }
         }
 
-        if (operators.size() == 0 &&
-            variables.size() == 0 &&
-            op2var.size() == 0) {
+        if (operators.empty() && variables.empty() && op2var.empty()) {
             std::cout << " ~ no SecRule found ~ " << std::endl;
             continue;
         }