diff --git a/src/core/piobject.cpp b/src/core/piobject.cpp
index 3326ce9f..5087bf11 100755
--- a/src/core/piobject.cpp
+++ b/src/core/piobject.cpp
@@ -201,12 +201,13 @@ PIObject::__EHFunc PIObject::methodEH(const void * addr) const {
 }
 
 
-void PIObject::piConnect(PIObject * src, const PIString & sig, PIObject * dest_o, void * dest, void * ev_h, void * e_h, int args) {
+void PIObject::piConnect(PIObject * src, const PIString & sig, PIObject * dest_o, void * dest, void * ev_h, void * e_h, int args, const char * loc) {
 	//piCout << "piConnect ...";
 	//piCout << "piConnect" << src << (void*)(dest) << sig;
 	//piCout << "piConnect" << src->className() << "->" << ((PIObject*)dest)->className();
 	PIMutexLocker _ml(src->mutex_connect);
 	PIMutexLocker _mld(dest_o->mutex_connect, src != dest_o);
+	
 	src->connections << Connection(ev_h, e_h, sig, dest_o, dest, args);
 	//piCout << "piConnect" << ((PIObject*)dest) << sig << ((PIObject*)dest)->connectors.size_s() << "...";
 	//piCout << "addConnector" << dest_o << src;
@@ -216,14 +217,14 @@ void PIObject::piConnect(PIObject * src, const PIString & sig, PIObject * dest_o
 }
 
 
-bool PIObject::piConnectU(PIObject * src, const PIString & ename, PIObject * dest_o, void * dest, const PIString & hname) {
+bool PIObject::piConnectU(PIObject * src, const PIString & ename, PIObject * dest_o, void * dest, const PIString & hname, const char * loc) {
 	if (src == 0 || dest_o == 0 || dest == 0) return false;
 	if (!src->isPIObject()) {
-		piCout << "[piConnectU] \"" << ename << "\" -> \"" << hname << "\" error: source object is not PIObject!";
+		piCout << "[piConnectU] \"" << ename << "\" -> \"" << hname << "\" error: source object is not PIObject! (" << loc << ")";
 		return false;
 	}
 	if (!dest_o->isPIObject()) {
-		piCout << "[piConnectU] \"" << ename << "\" -> \"" << hname << "\" error: destination object is not PIObject!";
+		piCout << "[piConnectU] \"" << ename << "\" -> \"" << hname << "\" error: destination object is not PIObject! (" << loc << ")";
 		return false;
 	}
 	PIMutexLocker ml(__eh_mutex);
@@ -231,11 +232,11 @@ bool PIObject::piConnectU(PIObject * src, const PIString & ename, PIObject * des
 	PIMutexLocker mld(dest_o->mutex_connect, src != dest_o);
 	PIVector<__EHFunc> m_src = src->findEH(ename), m_dest = dest_o->findEH(hname);
 	if (m_src.isEmpty()) {
-		piCout << "[piConnectU] Error: can`t find event \"" << ename << "\" in class \"" << src->className() << "\"!";
+		piCout << "[piConnectU] Error: can`t find event \"" << ename << "\" in class \"" << src->className() << "\"! (" << loc << ")";
 		return false;
 	}
 	if (m_dest.isEmpty()) {
-		piCout << "[piConnectU] Error: can`t find handler \"" << hname << "\" in class \"" << dest_o->className() << "\"!";
+		piCout << "[piConnectU] Error: can`t find handler \"" << hname << "\" in class \"" << dest_o->className() << "\"! (" << loc << ")";
 		return false;
 	}
 	void * addr_src(0), * addr_dest(0);
@@ -253,7 +254,7 @@ bool PIObject::piConnectU(PIObject * src, const PIString & ename, PIObject * des
 	}
 	if (addr_src == 0) {
 		piCout << "[piConnectU] Error: can`t find suitable pair of event \"" << ename << "\" in class \"" << src->className()
-				<< "\" and handler \"" << hname << "\" in class \"" << dest_o->className() << "\"!";
+				<< "\" and handler \"" << hname << "\" in class \"" << dest_o->className() << "\"! (" << loc << ")";
 		return false;
 	}
 	//piCout << "connect" << ename << "->" << hname << "with" << args << "args";
diff --git a/src/core/piobject.h b/src/core/piobject.h
index 8515cd79..483a9759 100755
--- a/src/core/piobject.h
+++ b/src/core/piobject.h
@@ -176,6 +176,11 @@
 #else
 
 
+#define __STR(x) #x
+#define __SSTR(x) __STR(x)
+#define LOCATION __FILE__ ":" __SSTR(__LINE__)
+
+
 #define PIOBJECT(name) \
 	protected: \
 	typedef name __PIObject__; \
@@ -377,20 +382,20 @@
 #define RAISE_EVENT4(src, event, v0, v1, v2, v3) (src)->event(v0, v1, v2, v3);
 #define RAISE_EVENT RAISE_EVENT0
 
-#define CONNECTU(src, event, dest, handler) PIObject::piConnectU(src, PIStringAscii(#event), dest, dest, PIStringAscii(#handler));
+#define CONNECTU(src, event, dest, handler) PIObject::piConnectU(src, PIStringAscii(#event), dest, dest, PIStringAscii(#handler), LOCATION);
 
-#define CONNECT0(ret, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*))(&(src)->__stat_eh_##event##__), 0);
-#define CONNECT1(ret, a0, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0))(&(src)->__stat_eh_##event##__), 1);
-#define CONNECT2(ret, a0, a1, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0, a1))(&(src)->__stat_eh_##event##__), 2);
-#define CONNECT3(ret, a0, a1, a2, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0, a1, a2))(&(src)->__stat_eh_##event##__), 3);
-#define CONNECT4(ret, a0, a1, a2, a3, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2, a3))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0, a1, a2, a3))(&(src)->__stat_eh_##event##__), 4);
+#define CONNECT0(ret, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*))(&(src)->__stat_eh_##event##__), 0, LOCATION);
+#define CONNECT1(ret, a0, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0))(&(src)->__stat_eh_##event##__), 1, LOCATION);
+#define CONNECT2(ret, a0, a1, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0, a1))(&(src)->__stat_eh_##event##__), 2, LOCATION);
+#define CONNECT3(ret, a0, a1, a2, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0, a1, a2))(&(src)->__stat_eh_##event##__), 3, LOCATION);
+#define CONNECT4(ret, a0, a1, a2, a3, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2, a3))(&(dest)->__stat_eh_##handler##__), (void*)(void(*)(void*, a0, a1, a2, a3))(&(src)->__stat_eh_##event##__), 4, LOCATION);
 #define CONNECT CONNECT0
 
-#define WEAK_CONNECT0(ret, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*))(&(dest)->__stat_eh_##handler##__), 0, 0);
-#define WEAK_CONNECT1(ret, a0, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0))(&(dest)->__stat_eh_##handler##__), 0, 1);
-#define WEAK_CONNECT2(ret, a0, a1, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1))(&(dest)->__stat_eh_##handler##__), 0, 2);
-#define WEAK_CONNECT3(ret, a0, a1, a2, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2))(&(dest)->__stat_eh_##handler##__), 0, 3);
-#define WEAK_CONNECT4(ret, a0, a1, a2, a3, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2, a3))(&(dest)->__stat_eh_##handler##__), 0, 4);
+#define WEAK_CONNECT0(ret, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*))(&(dest)->__stat_eh_##handler##__), 0, 0, LOCATION);
+#define WEAK_CONNECT1(ret, a0, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0))(&(dest)->__stat_eh_##handler##__), 0, 1, LOCATION);
+#define WEAK_CONNECT2(ret, a0, a1, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1))(&(dest)->__stat_eh_##handler##__), 0, 2, LOCATION);
+#define WEAK_CONNECT3(ret, a0, a1, a2, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2))(&(dest)->__stat_eh_##handler##__), 0, 3, LOCATION);
+#define WEAK_CONNECT4(ret, a0, a1, a2, a3, src, event, dest, handler) PIObject::piConnect(src, PIStringAscii(#event), dest, dest, (void*)(ret(*)(void*, a0, a1, a2, a3))(&(dest)->__stat_eh_##handler##__), 0, 4, LOCATION);
 #define WEAK_CONNECT WEAK_CONNECT0
 
 #define DISCONNECT0(ret, src, event, dest, handler) PIObject::piDisconnect(src, PIStringAscii(#event), dest, (void*)(ret(*)(void*))(&(dest)->__stat_eh_##handler##__));
@@ -504,8 +509,8 @@ public:
 	*/
 
 	// / Direct connect
-	static void piConnect(PIObject * src, const PIString & sig, PIObject * dest_o, void * dest, void * ev_h, void * e_h, int args);
-	static bool piConnectU(PIObject * src, const PIString & ename, PIObject * dest_o, void * dest, const PIString & hname);
+	static void piConnect(PIObject * src, const PIString & sig, PIObject * dest_o, void * dest, void * ev_h, void * e_h, int args, const char * loc);
+	static bool piConnectU(PIObject * src, const PIString & ename, PIObject * dest_o, void * dest, const PIString & hname, const char * loc);
 	
 	// / Through names and mixed
 	static void piConnect(const PIString & src, const PIString & sig, void * dest, void * ev_h);
diff --git a/src/io/pibinarylog.cpp b/src/io/pibinarylog.cpp
index 04c37ba3..7d14ba9d 100644
--- a/src/io/pibinarylog.cpp
+++ b/src/io/pibinarylog.cpp
@@ -142,6 +142,7 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
 		break;
 	case PlayVariableSpeed:
 		delay = lastrecord.timestamp.toMilliseconds() - play_time;
+		piCoutObj << "delay" << delay;
 		double cdelay;
 		int dtc;
 		if (is_started) {
diff --git a/src/io/piconnection.cpp b/src/io/piconnection.cpp
index 38997542..b64da786 100755
--- a/src/io/piconnection.cpp
+++ b/src/io/piconnection.cpp
@@ -897,7 +897,8 @@ PIIODevice * PIConnection::DevicePool::addDevice(PIConnection * parent, const PI
 	if (!fake) {
 		dd->dev->close();
 		dd->dev->open((PIIODevice::DeviceMode)pmode);
-	}
+	} else
+		dd->dev->setMode((PIIODevice::DeviceMode)pmode);
 	if (need_start && start) {
 		if (!fake) dd->rthread->start();
 		dd->started = true;
diff --git a/src/io/piiodevice.h b/src/io/piiodevice.h
index 59037523..22414558 100755
--- a/src/io/piiodevice.h
+++ b/src/io/piiodevice.h
@@ -67,6 +67,9 @@ public:
 	//! Current open mode of device
 	DeviceMode mode() const {return mode_;}
 	
+	//! Set open mode of device
+	void setMode(DeviceMode m) {mode_ = m;}
+	
 	//! Current path of device
 	PIString path() const {return property(PIStringAscii("path")).toString();}