diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 4ac2589a9a7..82ff7168d82 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -368,7 +373,8 @@ static void r300_clear(struct pipe_context* pipe,
         util_blitter_clear(r300->blitter, width, height, 1,
                            buffers, color, depth, stencil);
         r300_blitter_end(r300);
-    } else if (r300->zmask_clear.dirty ||
+/* TIPP: here maybe not else if, just an if should be present??? */
+    } /*else*/ if (r300->zmask_clear.dirty ||
                r300->hiz_clear.dirty ||
                r300->cmask_clear.dirty) {
         /* Just clear zmask and hiz now, this does not use the standard draw
@@ -406,7 +412,7 @@ static void r300_clear(struct pipe_context* pipe,
             r300->cmask_clear.dirty = FALSE;
         }
     } else {
-        assert(0);
+        //assert(0); // FIXME!!!
     }
 
     /* Disable CBZB clear. */
diff --git a/src/gallium/drivers/r300/r300_hyperz.c b/src/gallium/drivers/r300/r300_hyperz.c
index d86819afa7c..f1c75dac40b 100644
--- a/src/gallium/drivers/r300/r300_hyperz.c
+++ b/src/gallium/drivers/r300/r300_hyperz.c
@@ -134,6 +134,7 @@ static void r300_update_hyperz(struct r300_context* r300)
     struct pipe_framebuffer_state *fb =
         (struct pipe_framebuffer_state*)r300->fb_state.state;
     struct r300_dsa_state *dsa = r300->dsa_state.state;
+    /* Z and/or stencil buffer texture */
     struct r300_resource *zstex =
             fb->zsbuf ? r300_resource(fb->zsbuf->texture) : NULL;