diff --git a/src_main/core/piobject.cpp b/src_main/core/piobject.cpp
index 1f1451d0..c1210bfa 100755
--- a/src_main/core/piobject.cpp
+++ b/src_main/core/piobject.cpp
@@ -302,10 +302,10 @@ bool PIObject::piConnectU(PIObject * src, const PIString & ename, PIObject * des
 				<< "\" and handler \"" << hname << "\" in class \"" << dest_o->className() << "\"! (" << loc << ")";
 		return false;
 	}
-	//piCout << "connect" << ename << "->" << hname << "with" << args << "args";
 	src->connections << PIObject::__Connection(addr_dest, addr_src, ename, dest_o, dest, args, performer);
 	if (que) performer->proc_event_queue = true;
 	dest_o->connectors << src;
+	//piCout << cc << cq << _ol.size();//"connect" << src << "->" << dest_o << ", dest.connectors.size() =" << dest_o->connectors.size();
 	return true;
 }
 
diff --git a/src_main/io_devices/piserial.cpp b/src_main/io_devices/piserial.cpp
index f4d4652f..46c947da 100755
--- a/src_main/io_devices/piserial.cpp
+++ b/src_main/io_devices/piserial.cpp
@@ -733,10 +733,15 @@ PIStringList PISerial::availableDevices(bool test) {
 	RegOpenKey(HKEY_LOCAL_MACHINE, (LPCTSTR)"HARDWARE\\DEVICEMAP\\SERIALCOMM", &key);
 	if (key != 0) {
 		char name[1024], data[1024];
-		DWORD name_len = 1024, data_len = 1024, type = 0, index = 0;
-		LONG ret;
-		while ((ret = RegEnumValue(key, index, (LPTSTR)name, &name_len, NULL, &type, (uchar * )data, &data_len)) != ERROR_NO_MORE_ITEMS) {
-			dl << PIString(data);
+		DWORD index = 0;
+		LONG ret = ERROR_SUCCESS;
+		while (ret != ERROR_NO_MORE_ITEMS) {
+			memset(name, 0, 1024);
+			memset(data, 0, 1024);
+			DWORD name_len = 1024, data_len = 1024, type = 0;
+			ret = RegEnumValue(key, index, (LPTSTR)name, &name_len, NULL, &type, (uchar * )data, &data_len);
+			if (ret == ERROR_NO_MORE_ITEMS) break;
+			dl << PIString(data, data_len);
 			index++;
 		}
 		RegCloseKey(key);