diff --git a/lib/ido/servicedbobject.cpp b/lib/ido/servicedbobject.cpp
index 42eca6cc3..9a85f3d3e 100644
--- a/lib/ido/servicedbobject.cpp
+++ b/lib/ido/servicedbobject.cpp
@@ -317,7 +317,7 @@ void ServiceDbObject::CommentsChangedHandler(const Service::Ptr& svcfilter, cons
 	}
 }
 
-void ServiceDbObject::AddComments(Service::Ptr const& service)
+void ServiceDbObject::AddComments(const Service::Ptr& service)
 {
 	/* dump all comments */
 	Dictionary::Ptr comments = service->GetComments();
@@ -334,7 +334,7 @@ void ServiceDbObject::AddComments(Service::Ptr const& service)
 	}
 }
 
-void ServiceDbObject::AddComment(Service::Ptr const& service, Dictionary::Ptr const& comment)
+void ServiceDbObject::AddComment(const Service::Ptr& service, const Dictionary::Ptr& comment)
 {
 	Host::Ptr host = service->GetHost();
 
@@ -358,7 +358,7 @@ void ServiceDbObject::AddComment(Service::Ptr const& service, Dictionary::Ptr co
 	}
 }
 
-void ServiceDbObject::AddCommentByType(DynamicObject::Ptr const& object, Dictionary::Ptr const& comment)
+void ServiceDbObject::AddCommentByType(const DynamicObject::Ptr& object, const Dictionary::Ptr& comment)
 {
 	unsigned long entry_time = static_cast<long>(comment->Get("entry_time"));
 	unsigned long entry_time_usec = (comment->Get("entry_time") - entry_time) * 1000 * 1000;
@@ -402,7 +402,7 @@ void ServiceDbObject::AddCommentByType(DynamicObject::Ptr const& object, Diction
 	OnQuery(query1);
 }
 
-void ServiceDbObject::DeleteComments(Service::Ptr const& service)
+void ServiceDbObject::DeleteComments(const Service::Ptr& service)
 {
 	/* delete all comments associated for this host/service */
 	Log(LogDebug, "ido", "delete comments for '" + service->GetName() + "'");
diff --git a/lib/ido/servicedbobject.h b/lib/ido/servicedbobject.h
index 4d095ee3d..99b052d99 100644
--- a/lib/ido/servicedbobject.h
+++ b/lib/ido/servicedbobject.h
@@ -52,10 +52,10 @@ protected:
 
 	static void CommentsChangedHandler(const Service::Ptr& service, const String& id, CommentChangedType type);
 
-	static void AddComments(Service::Ptr const& service);
-	static void AddComment(Service::Ptr const& service, Dictionary::Ptr const& comment);
-	static void AddCommentByType(DynamicObject::Ptr const& object, Dictionary::Ptr const& comment);
-	static void DeleteComments(Service::Ptr const& service);
+	static void AddComments(const Service::Ptr& service);
+	static void AddComment(const Service::Ptr& service, const Dictionary::Ptr& comment);
+	static void AddCommentByType(const DynamicObject::Ptr& object, const Dictionary::Ptr& comment);
+	static void DeleteComments(const Service::Ptr& service);
 };
 
 }