diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 4832430..3fb6654 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -390,7 +390,7 @@
       FLAGS_minor_version = minor_version;
     } else {
       if (is_delta) {
-        FLAGS_minor_version = DeltaPerformer::kSupportedMinorPayloadVersion;
+        FLAGS_minor_version = kInPlaceMinorPayloadVersion;
       } else {
         FLAGS_minor_version = DeltaPerformer::kFullPayloadMinorVersion;
       }
diff --git a/utils.cc b/utils.cc
index c512414..1f57672 100644
--- a/utils.cc
+++ b/utils.cc
@@ -1580,7 +1580,10 @@
   std::string result;
   if (base::PathExists(path) && store.Load(path) &&
       store.GetString("PAYLOAD_MINOR_VERSION", &result)) {
-    *minor_version = atoi(result.c_str());
+    if (!base::StringToUint(result, minor_version)) {
+      LOG(ERROR) << "StringToUint failed when parsing delta minor version.";
+      return false;
+    }
     return true;
   }
   return false;