diff --git a/lib/mu-maildir.c b/lib/mu-maildir.c
index ee95d72a..de13f776 100644
--- a/lib/mu-maildir.c
+++ b/lib/mu-maildir.c
@@ -14,7 +14,7 @@
 ** GNU General Public License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software Foundation,
+** along with this program; if not, write to 59the Free Software Foundation,
 ** Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 **
 */
@@ -656,6 +656,8 @@ mu_maildir_get_flags_from_path (const char *path)
 		dir  = g_path_get_dirname (path);
 		dir2 = g_path_get_basename (dir);
 
+		flags = MU_FLAG_NONE;
+
 		if (g_strcmp0 (dir2, "new") == 0)
 			flags = MU_FLAG_NEW;
 
diff --git a/lib/mu-runtime.c b/lib/mu-runtime.c
index e1a5e6e5..b73f73d4 100644
--- a/lib/mu-runtime.c
+++ b/lib/mu-runtime.c
@@ -81,7 +81,10 @@ mu_runtime_init (const char* muhome_arg, const char *name)
 	g_return_val_if_fail (name, FALSE);
 
 	setlocale (LC_ALL, "");
+
+#ifndef GLIB_VERSION_2_36
 	g_type_init ();
+#endif /*GLIB_VERSION_2_36*/
 
 	if (muhome_arg)
 		muhome = g_strdup (muhome_arg);
diff --git a/mu/mu-cmd-server.c b/mu/mu-cmd-server.c
index 5626f3dc..00c668bc 100644
--- a/mu/mu-cmd-server.c
+++ b/mu/mu-cmd-server.c
@@ -805,6 +805,8 @@ cmd_extract (ServerContext *ctx, GSList *args, GError **err)
 	MuError rv;
 	const char* actionstr, *indexstr;
 
+	rv = MU_ERROR;
+
 	/* read parameters */
 	GET_STRING_OR_ERROR_RETURN (args, "action", &actionstr, err);
 	GET_STRING_OR_ERROR_RETURN (args, "index",  &indexstr, err);
diff --git a/mu/mu.cc b/mu/mu.cc
index 3c65ee6c..3c20a3d0 100644
--- a/mu/mu.cc
+++ b/mu/mu.cc
@@ -87,7 +87,10 @@ main (int argc, char *argv[])
 	MuConfig *conf;
 
 	setlocale (LC_ALL, "");
+
+#ifndef GLIB_VERSION_2_36
 	g_type_init ();
+#endif /*GLIB_VERSION_2_36*/
 
 	err = NULL;
 	rv  = MU_OK;