diff --git a/ewmhints.c b/ewmhints.c
index c7e1215..8f7f99e 100644
--- a/ewmhints.c
+++ b/ewmhints.c
@@ -87,7 +87,7 @@ get_property_value(char *propname, long max_length,
    Returns -1 on error
 */
 static int
-get_current_desktop()
+get_current_desktop(void)
 {
 	unsigned long nitems_return;
 	uint32 *prop_return;
diff --git a/xkeymap.c b/xkeymap.c
index 4328f1e..3eb922f 100644
--- a/xkeymap.c
+++ b/xkeymap.c
@@ -198,7 +198,7 @@ xkeymap_read(char *mapname)
 			/* Automatically add uppercase key, with same modifiers 
 			   plus shift */
 			for (p = keyname; *p; p++)
-				*p = toupper(*p);
+				*p = toupper((int)*p);
 			MASK_ADD_BITS(modifiers, MapLeftShiftMask);
 			add_to_keymap(keyname, scancode, modifiers, mapname);
 		}
@@ -220,7 +220,7 @@ xkeymap_init(void)
 	mapname_ptr = keymapname;
 	while (*mapname_ptr)
 	{
-		*mapname_ptr = tolower(*mapname_ptr);
+		*mapname_ptr = tolower((int)*mapname_ptr);
 		mapname_ptr++;
 	}
 
diff --git a/xwin.c b/xwin.c
index bdcf3e7..63b65e2 100644
--- a/xwin.c
+++ b/xwin.c
@@ -315,9 +315,14 @@ ui_init(void)
 	if ((width == 0) || (height == 0))
 	{
 		/* Fetch geometry from _NET_WORKAREA */
-		uint32 xpos, ypos;
+		uint32 x, y, cx, cy;
 
-		if (get_current_workarea(&xpos, &ypos, &width, &height) < 0)
+		if (get_current_workarea(&x, &y, &cx, &cy) == 0)
+		{
+			width = cx;
+			height = cy;
+		}
+		else
 		{
 			warning("Failed to get workarea: probably your window manager does not support extended hints\n");
 			width = 800;