diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0844598c..ea77872a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,7 +284,7 @@ endif()
 if(APPLE)
 	add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
 endif()
-if ((NOT DEFINED LIBPROJECT) AND (DEFINED ANDROID_PLATFORM))
+if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
 	include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)
 	#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
 	#message("${ANDROID_NDK}/sysroot/usr/include")
diff --git a/libs/cloud/picloudclient.cpp b/libs/cloud/picloudclient.cpp
index aae1d89e..06239090 100644
--- a/libs/cloud/picloudclient.cpp
+++ b/libs/cloud/picloudclient.cpp
@@ -85,6 +85,7 @@ bool PICloudClient::openDevice() {
 
 
 bool PICloudClient::closeDevice() {
+	PIThread::stop(false);
 	if (is_connected) {
 		is_connected = false;
 		disconnected();
diff --git a/libs/main/system/pisysteminfo.cpp b/libs/main/system/pisysteminfo.cpp
index aec6aeb2..66806052 100644
--- a/libs/main/system/pisysteminfo.cpp
+++ b/libs/main/system/pisysteminfo.cpp
@@ -259,7 +259,7 @@ uint PISystemInfo::machineID() {
 	if (ret == 0) {
 		CRC_32 crc = standardCRC_32();
 		ret = crc.calculate(machineKey().toByteArray());
-		piCout << "machineID \"" << machineKey() << "\" =" << PICoutManipulators::Hex << ret;
+		//piCout << "machineID \"" << machineKey() << "\" =" << PICoutManipulators::Hex << ret;
 	}
 	return ret;
 }
diff --git a/main.cpp b/main.cpp
index 66ab2f11..9f4f46d9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,7 +2,25 @@
 
 
 int main(int argc, char * argv[]) {
-	PICLI cli(argc, argv);
+	PIByteArray v0 = PIByteArray::fromHex("01020304");
+	PIByteArray v1 = PIByteArray::fromHex("01020304");
+	piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
+	v0 = PIByteArray::fromHex("0102030405");
+	v1 = PIByteArray::fromHex("01020304");
+	piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
+	v0 = PIByteArray::fromHex("01020304");
+	v1 = PIByteArray::fromHex("0102030405");
+	piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
+	v0 = PIByteArray::fromHex("01020404");
+	v1 = PIByteArray::fromHex("01020304");
+	piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
+	v0 = PIByteArray::fromHex("0102040405");
+	v1 = PIByteArray::fromHex("01020304");
+	piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
+	v0 = PIByteArray::fromHex("01020404");
+	v1 = PIByteArray::fromHex("0102030405");
+	piCout << "==" << (v0 == v1) << ", !=" << (v0 != v1) << ", <" << (v0 < v1) << ", >" << (v0 > v1);
+	/*PICLI cli(argc, argv);
 	PITimer tm;
 	cli.addArgument("connect", true);
 	cli.addArgument("name", true);
@@ -59,6 +77,6 @@ int main(int argc, char * argv[]) {
 	PIKbdListener ls;
 	ls.enableExitCapture(PIKbdListener::F10);
 	ls.start();
-	WAIT_FOR_EXIT
+	WAIT_FOR_EXIT*/
 	return 0;
 }
diff --git a/utils/cloud_dispatcher/CMakeLists.txt b/utils/cloud_dispatcher/CMakeLists.txt
index f014408c..4db22a31 100644
--- a/utils/cloud_dispatcher/CMakeLists.txt
+++ b/utils/cloud_dispatcher/CMakeLists.txt
@@ -22,5 +22,6 @@ if (NOT DEFINED ANDROID_PLATFORM)
 		DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR}
 		DESTINATION ${ROOT_DIR}/release
 		DEB_ADD_SERVICE
+		ADD_MANIFEST
 		)
 endif()