diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index afc8340c58..35e94e8faf 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1366,8 +1366,8 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
       if (val &&
           (info->state == 0 ||
            info->state == state ||
-           (info->state & state) != 0 &&
-           (info->state & ~(state)) == 0))
+           ((info->state & state) != 0 &&
+	    (info->state & ~(state)) == 0)))
         {
           const gchar *val_str;
 
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 1b6f1e5986..c4cefe6abd 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3275,7 +3275,7 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
   GdkPixbuf *pixbuf;
   GdkRGBA *color = NULL;
   GdkRGBA rgba;
-  gchar *css_fg, *css_success;
+  gchar *css_fg = NULL, *css_success;
   gchar *css_warning, *css_error;
   GtkStateFlags state;