diff --git a/src/pEpLog.cc b/src/pEpLog.cc
index f9ec1a2..b922f8e 100644
--- a/src/pEpLog.cc
+++ b/src/pEpLog.cc
@@ -66,7 +66,7 @@ namespace pEp {
                 this->set_instancename(to_string(auto_instance_nr));
             }
 
-            void pEpLogger::log(const string& msg)
+            void pEpLogger::log(const string& msg) const
             {
                 std::stringstream msg_;
                 msg_ << std::this_thread::get_id();
@@ -76,34 +76,34 @@ namespace pEp {
                 this->logRaw(msg_.str());
             }
 
-            void pEpLogger::logRaw(const string& msg)
+            void pEpLogger::logRaw(const string& msg) const
             {
                 if (this->is_enabled) {
                     _log(msg);
                 }
             }
 
-            void pEpLogger::set_enabled(const bool& is_enabled)
+            void pEpLogger::set_enabled(const bool& enabled)
             {
-                this->is_enabled = is_enabled;
+                this->is_enabled = enabled;
             }
 
-            bool pEpLogger::get_enabled()
+            bool pEpLogger::get_enabled() const
             {
                 return this->is_enabled;
             }
 
-            string pEpLogger::get_classname()
+            string pEpLogger::get_classname() const
             {
                 return this->classname;
             }
 
-            void pEpLogger::set_instancename(const string& instancename)
+            void pEpLogger::set_instancename(const string& name)
             {
-                this->instancename = instancename;
+                this->instancename = name;
             }
 
-            string pEpLogger::get_instancename()
+            string pEpLogger::get_instancename() const
             {
                 return this->instancename;
             }
diff --git a/src/pEpLog.hh b/src/pEpLog.hh
index b81e2a7..3ef9daa 100644
--- a/src/pEpLog.hh
+++ b/src/pEpLog.hh
@@ -91,7 +91,7 @@ namespace pEp {
             msg_ << " - " << this->m4gic_logger_n4ame.get_classname();                               \
             msg_ << "[" << this->m4gic_logger_n4ame.get_instancename() << "]";            \
             msg_ << "::" << __FUNCTION__; \
-            msg_ << " - " << msg;                                                                \
+            msg_ << " - " << (msg);                                                                \
             this->m4gic_logger_n4ame.logRaw(msg_.str());                                               \
         } while (0)
 #endif // NDEBUG
@@ -119,15 +119,15 @@ namespace pEp {
                 pEpLogger() = delete;
                 pEpLogger(const std::string& classname, const bool& enabled);
                 // Print a logging message in the format "thread - classname[instancename] - <msg>"
-                void log(const std::string& msg);
+                void log(const std::string& msg) const;
                 // Prints just "<msg>"
-                void logRaw(const std::string& msg);
-                void set_enabled(const bool& is_enabled);
-                bool get_enabled();
-                std::string get_classname();
+                void logRaw(const std::string& msg) const;
+                void set_enabled(const bool& enabled);
+                bool get_enabled() const;
+                std::string get_classname() const;
                 // If never set, the default instancename is a unique number
-                void set_instancename(const std::string& instancename);
-                std::string get_instancename();
+                void set_instancename(const std::string& name);
+                std::string get_instancename() const;
             private:
                 static int auto_instance_nr;
                 bool is_enabled;