diff --git a/src/tag.c b/src/tag.c
index a45de91..145d40f 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -389,7 +389,7 @@ tag_new(int s, char *name)
 
      tags[s][conf.ntag[s]] = t;
 
-     tags[s][conf.ntag[s]].name = _strdup(((strlen(name)) ? name : "new tag"));
+     tags[s][conf.ntag[s]].name = _strdup((name ? name : "new tag"));
 
      infobar_update_taglist(s);
      infobar_draw(s);
@@ -405,6 +405,7 @@ uicb_tag_new(uicb_t cmd)
 {
      screen_get_sel();
 
+
      tag_new(selscreen, (char*)cmd);
 
      return;
@@ -455,9 +456,13 @@ tag_delete(int s, int tag)
 void
 uicb_tag_del(uicb_t cmd)
 {
+     int n;
+
      screen_get_sel();
 
-     tag_delete(selscreen, ((strlen((char*)cmd)) ? atoi(cmd) : seltag[selscreen]));
+     n = (cmd ? atoi(cmd) : seltag[selscreen]);
+
+     tag_delete(selscreen, n);
 
      return;
 }
diff --git a/src/wmfs.h b/src/wmfs.h
index 232ab0e..7e283a9 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -40,6 +40,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <fcntl.h>
 #include <time.h>
 #include <getopt.h>