diff --git a/src/client.c b/src/client.c
index a1ba1b8..a74c932 100644
--- a/src/client.c
+++ b/src/client.c
@@ -703,7 +703,7 @@ client_manage(Window w, XWindowAttributes *wa, bool ar)
 
      screen_get_sel();
 
-     c = zmalloc(sizeof(Client));
+     c = zcalloc(sizeof(Client));
      c->win = w;
      c->screen = selscreen;
      c->flags = 0;
diff --git a/src/infobar.c b/src/infobar.c
index 76e7eb1..b26a5d7 100644
--- a/src/infobar.c
+++ b/src/infobar.c
@@ -206,7 +206,7 @@ infobar_draw_selbar(InfoBar *i)
           barwin_map(i->selbar);
 
      /* Truncate string if too long */
-     if(conf.selbar.maxlength >= 0 && sel)
+     if(conf.selbar.maxlength >= 0 && sel && sel->title)
      {
           str = xcalloc(conf.selbar.maxlength + 4, sizeof(char));
           strncpy(str, sel->title, conf.selbar.maxlength);
@@ -424,8 +424,7 @@ uicb_infobar_toggledisplay(uicb_t cmd)
 
      new_pos = (tags[selscreen][seltag[selscreen]].barpos
                ? 0 : (tags[selscreen][seltag[selscreen]].prev_barpos
-               ? tags[selscreen][seltag[selscreen]].prev_barpos : 2
-               ));
+                    ? tags[selscreen][seltag[selscreen]].prev_barpos : 2));
 
      tags[selscreen][seltag[selscreen]].prev_barpos = tags[selscreen][seltag[selscreen]].barpos;
      tags[selscreen][seltag[selscreen]].barpos = new_pos;
diff --git a/src/structs.h b/src/structs.h
index 4ecd191..19ba931 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -543,6 +543,8 @@ typedef struct
 #endif /* HAVE_XFT */
      XFontSet fontset;
 } FontStruct;
+
+/* status.c util struct */
 typedef struct
 {
      int x, y, w, h;
diff --git a/src/tag.c b/src/tag.c
index 52dedd3..1027390 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -502,16 +502,12 @@ tag_additional(int sc, int tag, int adtag)
                || adtag < 1 || adtag == seltag[sc])
           return;
 
-     if(tags[sc][tag].flags & SplitFlag)
-          tags[sc][tag].flags &= ~SplitFlag;
-
-     tags[sc][tag].tagad ^= TagFlag(adtag);
-     tags[sc][adtag].flags |= RequestUpdateFlag;
-     tags[sc][tag].flags |= CleanFactFlag;
-     tags[sc][adtag].flags |= CleanFactFlag;
-
-     if(tags[sc][adtag].flags & SplitFlag)
-          tags[sc][adtag].flags &= ~SplitFlag;
+     tags[sc][tag].flags    &= ~SplitFlag;
+     tags[sc][tag].tagad    ^=  TagFlag(adtag);
+     tags[sc][adtag].flags  |=  RequestUpdateFlag;
+     tags[sc][tag].flags    |=  CleanFactFlag;
+     tags[sc][adtag].flags  |=  CleanFactFlag;
+     tags[sc][adtag].flags  &= ~SplitFlag;
 
      arrange(sc, True);