diff --git a/conanfile.py b/conanfile.py
index bcdd450f..2f9bd4c8 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomeObjectConan(ConanFile):
     name = "homeobject"
-    version = "2.0.1"
+    version = "2.0.2"
     homepage = "https://github.com/eBay/HomeObject"
     description = "Blob Store built on HomeReplication"
     topics = ("ebay")
diff --git a/src/include/homeobject/homeobject.hpp b/src/include/homeobject/homeobject.hpp
index 1b49125c..e5a6c5ff 100644
--- a/src/include/homeobject/homeobject.hpp
+++ b/src/include/homeobject/homeobject.hpp
@@ -22,7 +22,9 @@ struct device_info_t {
     friend std::istream& operator>>(std::istream& input, device_info_t& di) {
         std::string i_path, i_type;
         std::getline(input, i_path, ':');
-        std::getline(input, i_type);
+        if (input.peek() != EOF) {
+            std::getline(input, i_type);
+        }
         di.path = std::filesystem::canonical(i_path);
         if (i_type == "HDD") {
             di.type = DevType::HDD;
diff --git a/src/lib/homestore_backend/hs_homeobject.cpp b/src/lib/homestore_backend/hs_homeobject.cpp
index 64cc2e8d..431848d4 100644
--- a/src/lib/homestore_backend/hs_homeobject.cpp
+++ b/src/lib/homestore_backend/hs_homeobject.cpp
@@ -170,7 +170,7 @@ void HSHomeObject::init_homestore() {
                 {HS_SERVICE::REPLICATION,
                  hs_format_params{.dev_type = HSDevType::Data,
                                   .size_pct = 99.0,
-                                  .num_chunks = 60000,
+                                  .num_chunks = 32768,
                                   .block_size = _data_block_size,
                                   .alloc_type = blk_allocator_type_t::append,
                                   .chunk_sel_type = chunk_selector_type_t::CUSTOM}},