diff --git a/src/gui/ObjectListViewItem.cpp b/src/gui/ObjectListViewItem.cpp
index de8960e4a..63ad933d1 100644
--- a/src/gui/ObjectListViewItem.cpp
+++ b/src/gui/ObjectListViewItem.cpp
@@ -27,16 +27,16 @@ bool ObjectListViewItem::operator< ( const QTreeWidgetItem & other ) const
             ICMPService * licmp = ICMPService::cast(left);
             if (rtcpudp != NULL && ltcpudp != NULL)
             {
-                int ls = ltcpudp->getSrcRangeStart();
-                int rs = rtcpudp->getSrcRangeStart();
+                int ls = ltcpudp->getDstRangeStart();
+                int rs = rtcpudp->getDstRangeStart();
                 if (ls<rs) 
                     return true ;
                 else
                 {
                     if (ls==rs)
                     {
-                        int le = ltcpudp->getSrcRangeEnd();
-                        int re = rtcpudp->getSrcRangeEnd();
+                        int le = ltcpudp->getDstRangeEnd();
+                        int re = rtcpudp->getDstRangeEnd();
                         if (le<re) 
                             return true ;
                         else
diff --git a/src/gui/ObjectManipulator.cpp b/src/gui/ObjectManipulator.cpp
index 5be0695f8..d4166f0df 100644
--- a/src/gui/ObjectManipulator.cpp
+++ b/src/gui/ObjectManipulator.cpp
@@ -2475,14 +2475,14 @@ void ObjectManipulator::libChangedById(int id)
 
 void ObjectManipulator::changeFirstNotSystemLib()
 {
+    QString sid2 = "syslib000";
+    QString sid3 = "syslib001";
     for (int i = 0 ; i < idxToLibs.size(); i++)
     {
-        qDebug (QString().setNum(idxToLibs[i]->getId()).toAscii().data());
-        qDebug (QString().setNum(FWObjectDatabase::STANDARD_LIB_ID).toAscii().data());
-
-        if (idxToLibs[i]->getId()!=FWObjectDatabase::STANDARD_LIB_ID)
+        QString sid1 = FWObjectDatabase::getStringId(idxToLibs[i]->getId()).c_str();
+        if ( sid1 != sid2)
         {
-            if (idxToLibs[i]->getId()!=FWObjectDatabase::DELETED_OBJECTS_ID)
+            if (sid1!=sid3)
             {
                 libChanged(i);
                 m_objectManipulator->libs->setCurrentIndex(i);