Index: uspace/drv/char/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/char/ps2mouse/ps2mouse.c	(revision f81498d67b73b23de79f4d1473b8c9b7847b3f77)
+++ uspace/drv/char/ps2mouse/ps2mouse.c	(revision d87561c1ab4ed65ef38a64b56ff6713bd8bbe7ab)
@@ -70,6 +70,7 @@
 #define PS2_BUTTON_MASK(button) (1 << button)
 
-#define MOUSE_READ_BYTE_TEST(sess, value) \
+#define MOUSE_READ_BYTE_TEST(sess, value_) \
 do { \
+	uint8_t value = (value_); \
 	uint8_t data = 0; \
 	const ssize_t size = chardev_read(sess, &data, 1); \
@@ -78,13 +79,14 @@
 		return size < 0 ? size : EIO; \
 	} \
-	if (data != (value)) { \
+	if (data != value) { \
 		ddf_msg(LVL_DEBUG, "Failed testing byte: got %hhx vs. %hhx)", \
-		    data, (value)); \
+		    data, value); \
 		return EIO; \
 	} \
 } while (0)
 
-#define MOUSE_WRITE_BYTE(sess, value) \
+#define MOUSE_WRITE_BYTE(sess, value_) \
 do { \
+	uint8_t value = (value_); \
 	uint8_t data = (value); \
 	const ssize_t size = chardev_write(sess, &data, 1); \
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision f81498d67b73b23de79f4d1473b8c9b7847b3f77)
+++ uspace/drv/nic/rtl8139/driver.c	(revision d87561c1ab4ed65ef38a64b56ff6713bd8bbe7ab)
@@ -620,5 +620,5 @@
 		if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
 			ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", "
-			    "header 0x%4" PRIx16 ". Offset: %d)", size, frame_header,
+			    "header 0x%4" PRIx32 ". Offset: %" PRIu16 ")", size, frame_header,
 			    rx_offset);
 			goto rx_err;
Index: uspace/lib/c/generic/devman.c
===================================================================
--- uspace/lib/c/generic/devman.c	(revision f81498d67b73b23de79f4d1473b8c9b7847b3f77)
+++ uspace/lib/c/generic/devman.c	(revision d87561c1ab4ed65ef38a64b56ff6713bd8bbe7ab)
@@ -413,5 +413,5 @@
 	sysarg_t dretval;
 	
-	exch = devman_exchange_begin_blocking(LOC_PORT_CONSUMER);
+	exch = devman_exchange_begin_blocking(DEVMAN_CLIENT);
 	
 	ipc_call_t answer;
Index: uspace/lib/usbhid/src/hidiface.c
===================================================================
--- uspace/lib/usbhid/src/hidiface.c	(revision f81498d67b73b23de79f4d1473b8c9b7847b3f77)
+++ uspace/lib/usbhid/src/hidiface.c	(revision d87561c1ab4ed65ef38a64b56ff6713bd8bbe7ab)
@@ -90,5 +90,5 @@
 		return EINVAL;
 	
-	if ((buf == NULL))
+	if (buf == NULL)
 		return ENOMEM;
 	
@@ -184,5 +184,5 @@
 		return EINVAL;
 	
-	if ((buf == NULL))
+	if (buf == NULL)
 		return ENOMEM;
 	
