diff --git a/fastboot/device/variables.cpp b/fastboot/device/variables.cpp
index 9f3fa75..91e844a 100644
--- a/fastboot/device/variables.cpp
+++ b/fastboot/device/variables.cpp
@@ -191,7 +191,7 @@
         return false;
     }
     uint64_t size = get_block_device_size(handle.fd());
-    *message = android::base::StringPrintf("%" PRIX64, size);
+    *message = android::base::StringPrintf("0x%" PRIX64, size);
     return true;
 }
 
diff --git a/fastboot/fuzzy_fastboot/main.cpp b/fastboot/fuzzy_fastboot/main.cpp
index a7b22c6..dd64082 100644
--- a/fastboot/fuzzy_fastboot/main.cpp
+++ b/fastboot/fuzzy_fastboot/main.cpp
@@ -310,7 +310,7 @@
             << "getvar:all did not report any partition-size: through INFO responses";
     std::set<std::string> allowed{"ext4", "f2fs", "raw"};
     for (const auto p : parts) {
-        EXPECT_GT(std::get<1>(p), 0);
+        EXPECT_GE(std::get<1>(p), 0);
         std::string part(std::get<0>(p));
         std::set<std::string> allowed{"ext4", "f2fs", "raw"};
         std::string resp;