diff --git a/obexd/client/main.c b/obexd/client/main.c
index 81c4ccf..985690d 100644
--- a/obexd/client/main.c
+++ b/obexd/client/main.c
@@ -51,7 +51,7 @@ struct send_data {
 static void create_callback(struct session_data *session, void *user_data)
 {
 	struct send_data *data = user_data;
-	int i;
+	unsigned int i;
 
 	if (session->obex == NULL) {
 		DBusMessage *error = g_dbus_create_error(data->message,
diff --git a/obexd/client/session.c b/obexd/client/session.c
index 6e2bcf7..f01c8d0 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -235,7 +235,8 @@ static void search_callback(uint8_t type, uint16_t status,
 			uint8_t *rsp, size_t size, void *user_data)
 {
 	struct callback_data *callback = user_data;
-	int scanned, seqlen = 0, bytesleft = size;
+	unsigned int scanned, bytesleft = size;
+	int seqlen = 0;
 	uint8_t dataType, channel = 0;
 
 	if (status || type != SDP_SVC_SEARCH_ATTR_RSP)
diff --git a/obexd/client/session.h b/obexd/client/session.h
index 8d770c5..e391c73 100644
--- a/obexd/client/session.h
+++ b/obexd/client/session.h
@@ -49,7 +49,7 @@ struct session_data {
 	size_t buffer_len;
 	int filled;
 	ssize_t size;
-	size_t transferred;
+	ssize_t transferred;
 	gchar *filename;
 	gchar *agent_name;
 	gchar *agent_path;
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 0a0ce24..b62066c 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -738,7 +738,7 @@ static gboolean check_put(obex_t *obex, obex_object_t *obj)
 
 	free = buf.f_bsize * buf.f_bavail;
 	debug("Free space in disk: %lu", free);
-	if (os->size > free) {
+	if ((guint64) os->size > free) {
 		debug("Free disk space not available");
 		OBEX_ObjectSetRsp(obj, OBEX_RSP_FORBIDDEN, OBEX_RSP_FORBIDDEN);
 		return FALSE;