diff --git a/client/src/core/linux/request.cc b/client/src/core/linux/request.cc
index 6f56b18..4076d11 100644
--- a/client/src/core/linux/request.cc
+++ b/client/src/core/linux/request.cc
@@ -150,19 +150,19 @@
 		return *this;
 	}
 
-	static int getUIntValue(DBusMessageIter &iter) {
+	static unsigned int getUIntValue(DBusMessageIter &iter) {
 
 		if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_UINT32) {
 
 			dbus_uint32_t rc = 0;
 			dbus_message_iter_get_basic(&iter, &rc);
-			return (int) rc;
+			return (unsigned int) rc;
 
 		} else if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_UINT16) {
 
 			dbus_uint16_t rc = 0;
 			dbus_message_iter_get_basic(&iter, &rc);
-			return (int) rc;
+			return (unsigned int) rc;
 
 		} else if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_VARIANT) {
 
@@ -177,14 +177,15 @@
 
 					dbus_uint32_t rc = 0;
 					dbus_message_iter_get_basic(&sub, &rc);
-					return (int) rc;
+					return (unsigned int) rc;
 
 				} else if (current_type == DBUS_TYPE_UINT16) {
 					dbus_uint16_t rc = 0;
 					dbus_message_iter_get_basic(&sub, &rc);
-					return (int) rc;
+					return (unsigned int) rc;
 
 				}
+
 				dbus_message_iter_next(&sub);
 			}
 
@@ -218,6 +219,8 @@
 
 			while ((current_type = dbus_message_iter_get_arg_type(&sub)) != DBUS_TYPE_INVALID) {
 
+				debug("Current_type=",(char) current_type);
+
 				if (current_type == DBUS_TYPE_INT32) {
 
 					dbus_int32_t rc = 0;
diff --git a/client/src/session/remote/properties.cc b/client/src/session/remote/properties.cc
index bebf8a1..b4b3f0e 100644
--- a/client/src/session/remote/properties.cc
+++ b/client/src/session/remote/properties.cc
@@ -110,7 +110,7 @@
 
 	unsigned short IPC::Session::getScreenWidth() const {
 
-		int value;
+		uint32_t value;
 		getProperty("width",value);
 		return (unsigned short) value;
 
@@ -118,7 +118,7 @@
 
 	unsigned short IPC::Session::getScreenHeight() const {
 
-		int value;
+		uint32_t value;
 		getProperty("height",value);
 		return (unsigned short) value;
 
@@ -126,7 +126,7 @@
 
 	unsigned short IPC::Session::getScreenLength() const {
 
-		int value;
+		uint32_t value;
 		getProperty("length",value);
 		return (unsigned short) value;
 
diff --git a/client/src/testprogram/testprogram.cc b/client/src/testprogram/testprogram.cc
index f53c4e9..3bb2260 100644
--- a/client/src/testprogram/testprogram.cc
+++ b/client/src/testprogram/testprogram.cc
@@ -103,6 +103,7 @@
 			<< "Connection state is " << toCharString(host.getConnectionState()) << std::endl
 			<< "Program message is " << toCharString(host.getProgramMessage()) << std::endl
 			<< "Luname is " << host.getLUName() << std::endl
+			<< "Screen size is " << host.getScreenWidth() << "x" << host.getScreenHeight() << " (" << host.getScreenLength() << ")"
 			<< std::endl;
 
 		if(host) {
diff --git a/server/pw3270-plugin-ipc.cbp b/server/pw3270-plugin-ipc.cbp
index 774cad5..d64b95b 100644
--- a/server/pw3270-plugin-ipc.cbp
+++ b/server/pw3270-plugin-ipc.cbp
@@ -58,8 +58,6 @@
 		<Linker>
 			<Add option="`pkg-config --libs gtk+-3.0 lib3270 v3270 gio-2.0 dbus-1 dbus-glib-1`" />
 		</Linker>
-		<Unit filename="../common/src/include/lib3270/ipc-glib.h" />
-		<Unit filename="../common/src/include/lib3270/ipc.h" />
 		<Unit filename="src/core/constants.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -130,6 +128,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/include/config.h.in" />
+		<Unit filename="src/include/ipc-glib.h" />
 		<Unit filename="src/plugin/plugin.c">
 			<Option compilerVar="CC" />
 		</Unit>
--
libgit2 0.21.2