diff --git a/app/xdg-app-builtins-build-finish.c b/app/xdg-app-builtins-build-finish.c
index 18ab23b1..4a4ba0d0 100644
--- a/app/xdg-app-builtins-build-finish.c
+++ b/app/xdg-app-builtins-build-finish.c
@@ -341,7 +341,7 @@ xdg_app_builtin_build_finish (int argc, char **argv, GCancellable *cancellable,
   g_autoptr(GFile) metadata_file = NULL;
   g_autofree char *metadata_contents = NULL;
   g_autofree char *id = NULL;
-  gboolean is_runtime;
+  gboolean is_runtime = FALSE;
   gsize metadata_size;
   const char *directory;
   g_autoptr(GKeyFile) metakey = NULL;
diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c
index 80b1ef6e..a31c3efe 100644
--- a/builder/builder-manifest.c
+++ b/builder/builder-manifest.c
@@ -765,7 +765,7 @@ builder_manifest_checksum_for_cleanup (BuilderManifest *self,
 {
   GList *l;
 
-  builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_VERSION);
+  builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_CLEANUP_VERSION);
   builder_cache_checksum_strv (cache, self->cleanup);
   builder_cache_checksum_strv (cache, self->cleanup_commands);
   builder_cache_checksum_str (cache, self->rename_desktop_file);
@@ -787,7 +787,7 @@ builder_manifest_checksum_for_finish (BuilderManifest *self,
                                       BuilderCache *cache,
                                       BuilderContext *context)
 {
-  builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_VERSION);
+  builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_FINISH_VERSION);
   builder_cache_checksum_strv (cache, self->finish_args);
   builder_cache_checksum_str (cache, self->command);
 
@@ -812,7 +812,7 @@ builder_manifest_checksum_for_platform (BuilderManifest *self,
                                         BuilderCache *cache,
                                         BuilderContext *context)
 {
-  builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_VERSION);
+  builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_PLATFORM_VERSION);
   builder_cache_checksum_str (cache, self->id_platform);
   builder_cache_checksum_str (cache, self->metadata);
   builder_cache_checksum_strv (cache, self->cleanup_platform);
diff --git a/builder/builder-manifest.h b/builder/builder-manifest.h
index ed1ee121..007394be 100644
--- a/builder/builder-manifest.h
+++ b/builder/builder-manifest.h
@@ -37,6 +37,9 @@ typedef struct BuilderManifest BuilderManifest;
 
 /* Bump this if format changes in incompatible ways to force rebuild */
 #define BUILDER_MANIFEST_CHECKSUM_VERSION "1"
+#define BUILDER_MANIFEST_CHECKSUM_CLEANUP_VERSION "1"
+#define BUILDER_MANIFEST_CHECKSUM_FINISH_VERSION "2"
+#define BUILDER_MANIFEST_CHECKSUM_PLATFORM_VERSION "1"
 
 GType builder_manifest_get_type (void);