diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc
index 2fa56596a..d16adec0b 100644
--- a/retroshare-nogui/src/notifytxt.cc
+++ b/retroshare-nogui/src/notifytxt.cc
@@ -144,8 +144,8 @@ void NotifyTxt::notifyListChange(int list, int type)
 			
 void NotifyTxt::displayNeighbours()
 {
-	std::list<std::string> neighs;
-	std::list<std::string>::iterator it;
+	std::list<RsPgpId> neighs;
+	std::list<RsPgpId>::iterator it;
 
 	rsPeers->getGPGAllList(neighs);
 
@@ -153,7 +153,7 @@ void NotifyTxt::displayNeighbours()
 	for(it = neighs.begin(); it != neighs.end(); it++)
 	{
 		RsPeerDetails detail;
-		rsPeers->getPeerDetails(*it, detail);
+		rsPeers->getGPGDetails(*it, detail);
 
 		out << "Neighbour: ";
 		out << detail;
@@ -164,8 +164,8 @@ void NotifyTxt::displayNeighbours()
 
 void NotifyTxt::displayFriends()
 {
-	std::list<std::string> ids;
-	std::list<std::string>::iterator it;
+	std::list<RsPeerId> ids;
+	std::list<RsPeerId>::iterator it;
 
 	rsPeers->getFriendList(ids);
 
diff --git a/retroshare-nogui/src/retroshare.cc b/retroshare-nogui/src/retroshare.cc
index 545fa1790..9b6f32007 100644
--- a/retroshare-nogui/src/retroshare.cc
+++ b/retroshare-nogui/src/retroshare.cc
@@ -24,15 +24,6 @@
  *
  */
 
-#error "******************************************************************************************************************"
-#error "**** Retroshare trunk/ is currently being merged to v0.6 and protocols are not stable. It is unlikely that   *****"
-#error "**** you want to compile the trunk now.                                                                      *****"
-#error "****                                                                                                         *****"
-#error "**** To compile the latest Retroshare 0.5.5, please go to branches/v0.5.5                                    *****"
-#error "****                                                                                                         *****"
-#error "****    --- The dev team ---                                                                                 *****"
-#error "******************************************************************************************************************"
-
 #include <retroshare/rsiface.h>   /* definition of iface */
 #include <retroshare/rsinit.h>   /* definition of iface */