diff --git a/include/mimalloc-types.h b/include/mimalloc-types.h
index 04148f3e..106eaaef 100644
--- a/include/mimalloc-types.h
+++ b/include/mimalloc-types.h
@@ -75,8 +75,8 @@ terms of the MIT license. A copy of the license can be found in the file
 
 // Main tuning parameters for segment and page sizes
 // Sizes for 64-bit, divide by two for 32-bit
-#define MI_SMALL_PAGE_SHIFT               (13 + MI_INTPTR_SHIFT)      // 64kb
-#define MI_LARGE_PAGE_SHIFT               ( 6 + MI_SMALL_PAGE_SHIFT)  // 4mb
+#define MI_SMALL_PAGE_SHIFT               (14 + MI_INTPTR_SHIFT)      // 64kb
+#define MI_LARGE_PAGE_SHIFT               ( 5 + MI_SMALL_PAGE_SHIFT)  // 4mb
 #define MI_SEGMENT_SHIFT                  ( MI_LARGE_PAGE_SHIFT)      // 4mb
 
 // Derived constants
diff --git a/src/options.c b/src/options.c
index 9362cb64..b27f714f 100644
--- a/src/options.c
+++ b/src/options.c
@@ -35,7 +35,7 @@ static mi_option_desc_t options[_mi_option_last] = {
   { 0, UNINIT, "page_reset" },
   { 0, UNINIT, "cache_reset" },
   { 0, UNINIT, "pool_commit" },
-  { 1, UNINIT, "eager_commit" },     // secure must have eager commit
+  { 0, UNINIT, "eager_commit" },     // secure must have eager commit
   { 0, UNINIT, "large_os_pages" },   // use large OS pages
   { 0, UNINIT, "reset_decommits" },
   { 0, UNINIT, "reset_discards" },
diff --git a/src/segment.c b/src/segment.c
index eae33bba..edae881a 100644
--- a/src/segment.c
+++ b/src/segment.c
@@ -736,13 +736,21 @@ static mi_page_t* mi_segment_huge_page_alloc(size_t size, mi_segments_tld_t* tld
 
 mi_page_t* _mi_segment_page_alloc(size_t block_size, mi_segments_tld_t* tld, mi_os_tld_t* os_tld) {
   mi_page_t* page;
-  if (block_size <= (MI_SMALL_PAGE_SIZE / 8))
+  if (block_size <= (MI_SMALL_PAGE_SIZE / 8)) {
     // smaller blocks than 8kb (assuming MI_SMALL_PAGE_SIZE == 64kb)
     page = mi_segment_small_page_alloc(tld,os_tld);
-  else if (block_size < (MI_LARGE_SIZE_MAX - sizeof(mi_segment_t)))
-    page = mi_segment_large_page_alloc(tld, os_tld);
-  else
+  }
+  else if (block_size <= (MI_SMALL_PAGE_SIZE/2) && (MI_SMALL_PAGE_SIZE % block_size) <= (MI_SMALL_PAGE_SIZE / 8)) {
+    // use small page too if it happens to fit well
+    page = mi_segment_small_page_alloc(tld, os_tld);
+  }
+  else if (block_size < (MI_LARGE_SIZE_MAX - sizeof(mi_segment_t))) {
+    // otherwise use a large page
+    page = mi_segment_large_page_alloc(tld, os_tld);    
+  }
+  else {
     page = mi_segment_huge_page_alloc(block_size,tld,os_tld);
+  }
   mi_assert_expensive(page == NULL || mi_segment_is_valid(_mi_page_segment(page)));
   return page;
 }