diff --git a/src/client.c b/src/client.c
index 2a4417e..2bde1d5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -627,11 +627,10 @@ client_set_rules(Client *c)
           if((xch.res_class && conf.rule[i].class && !strcmp(xch.res_class, conf.rule[i].class))
                     || (xch.res_name && conf.rule[i].instance && !strcmp(xch.res_name, conf.rule[i].instance)))
           {
-               if( ((strlen(wwrole) && conf.rule[i].role && !strcmp(wwrole, conf.rule[i].role))
-                         || (!strlen(wwrole) || !conf.rule[i].role))
-		     &&
-		    ((strlen(netwmname) && conf.rule[i].name && !strcmp(netwmname, conf.rule[i].name))
-			 || (!strlen(netwmname) || !conf.rule[i].name)) )
+               if(((strlen(wwrole) && conf.rule[i].role && !strcmp(wwrole, conf.rule[i].role))
+                              || (!strlen(wwrole) || !conf.rule[i].role))
+                         && ((strlen(netwmname) && conf.rule[i].name && !strcmp(netwmname, conf.rule[i].name))
+                              || (!strlen(netwmname) || !conf.rule[i].name)))
                {
                     if(conf.rule[i].screen != -1)
                          c->screen = conf.rule[i].screen;
diff --git a/src/config.c b/src/config.c
index e5a8e8f..b113ddc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -678,7 +678,7 @@ conf_rule_section(void)
           conf.rule[i].class         = fetch_opt_first(rule[i], "", "class").str;
           conf.rule[i].instance      = fetch_opt_first(rule[i], "", "instance").str;
           conf.rule[i].role          = fetch_opt_first(rule[i], "", "role").str;
-	  conf.rule[i].name          = fetch_opt_first(rule[i], "", "name").str;
+          conf.rule[i].name          = fetch_opt_first(rule[i], "", "name").str;
           conf.rule[i].screen        = fetch_opt_first(rule[i], "-1", "screen").num;
           conf.rule[i].tag           = fetch_opt_first(rule[i], "-1", "tag").num;
           conf.rule[i].free          = fetch_opt_first(rule[i], "false", "free").boolean;
diff --git a/src/draw.c b/src/draw.c
index 488f7e3..6550a82 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -79,7 +79,7 @@ draw_image(Drawable dr, int x, int y, int w, int h, char *name)
   *\param str String
   *\return n Lenght of i
   */
-static int
+static void
 parse_image_block(Drawable dr, char *str)
 {
      ImageAttr im;