diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc
index 6d065c744..4c5692979 100644
--- a/libretroshare/src/gxs/rsgenexchange.cc
+++ b/libretroshare/src/gxs/rsgenexchange.cc
@@ -880,6 +880,7 @@ void RsGenExchange::msgsChanged(std::map<RsGxsGroupId,
 			mMsgChange.pop_back();
 			delete mc;
 		}
+            mGenMtx.unlock();
 	}
 }
 
@@ -899,6 +900,7 @@ void RsGenExchange::groupsChanged(std::list<RsGxsGroupId>& grpIds)
 			mGroupChange.pop_back();
 			delete gc;
 		}
+            mGenMtx.unlock();
 	}
 }
 
diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc
index 0a4b3d23d..8f22607d1 100644
--- a/libretroshare/src/gxs/rsgxsnetservice.cc
+++ b/libretroshare/src/gxs/rsgxsnetservice.cc
@@ -104,8 +104,7 @@ void RsGxsNetService::syncWithPeers()
         {
             RsGxsGrpMetaData* meta = mit->second;
 
-            if(meta->mSubscribeFlags & (GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED |
-               GXS_SERV::GROUP_SUBSCRIBE_ADMIN) )
+            if(meta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED )
                 grpIds.push_back(mit->first);
 
             delete meta;
@@ -1412,8 +1411,8 @@ void RsGxsNetService::handleRecvSyncGroup(RsNxsSyncGrp* item)
 	{
 		RsGxsGrpMetaData* grpMeta = mit->second;
 
-		if(grpMeta->mSubscribeFlags & (GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED |
-	               GXS_SERV::GROUP_SUBSCRIBE_ADMIN) )
+		if(grpMeta->mSubscribeFlags &
+				GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
 		{
 			RsNxsSyncGrpItem* gItem = new
 				RsNxsSyncGrpItem(mServType);
diff --git a/libretroshare/src/serialiser/rsserviceids.h b/libretroshare/src/serialiser/rsserviceids.h
index c47dba6a4..fa43aa817 100644
--- a/libretroshare/src/serialiser/rsserviceids.h
+++ b/libretroshare/src/serialiser/rsserviceids.h
@@ -138,7 +138,7 @@ const uint16_t RS_SERVICE_GXSV1_TYPE_WIRE        = 0xf304;
 const uint16_t RS_SERVICE_GXSV1_TYPE_FORUMS      = 0xf305;
 const uint16_t RS_SERVICE_GXSV1_TYPE_POSTED      = 0xf306;
 const uint16_t RS_SERVICE_GXSV1_TYPE_CHANNELS    = 0xf307;
-const uint16_t RS_SERVICE_GXSV1_TYPE_GXSCIRCLE   = 0xf307;
+const uint16_t RS_SERVICE_GXSV1_TYPE_GXSCIRCLE   = 0xf308;
 
 const uint16_t RS_SERVICE_GXSV2_TYPE_GXSID       = 0xf311;
 const uint16_t RS_SERVICE_GXSV2_TYPE_GXSCIRCLE   = 0xf312;