diff --git a/Makefile b/Makefile
index 6072ba1ed..49c55635d 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ CROSS_OBJCOPY	= $(CROSS_COMPILE)objcopy
 CROSS_SIZE	= $(CROSS_COMPILE)size
 
 # General flags
-CFLAGS ?= $(INCLUDES) -std=c99 -m32 #-fdiagnostics-color=always
+CFLAGS ?= $(INCLUDES) -std=c99 #-fdiagnostics-color=always
 #CFLAGS += -Wall -Wextra -Wpedantic -Wlogical-op -Winline
 #CFLAGS += -Wformat-nonliteral -Winit-self -Wstack-protector
 #CFLAGS += -Wconversion -Wsign-conversion -Wformat-security
diff --git a/src/liballocator/mem-poolman.h b/src/liballocator/mem-poolman.h
index 0426712dd..a669f4160 100644
--- a/src/liballocator/mem-poolman.h
+++ b/src/liballocator/mem-poolman.h
@@ -37,6 +37,7 @@ typedef enum {
     MEM_POOL_CHUNK_TYPE_8, /**< 8-byte chunk */
     MEM_POOL_CHUNK_TYPE_16, /**< 16-byte chunk */
     MEM_POOL_CHUNK_TYPE_32, /**< 32-byte chunk */
+    MEM_POOL_CHUNK_TYPE_64, /**< 64-byte chunk */
     MEM_POOL_CHUNK_TYPE__COUNT /**< count of possible pool chunks' sizes */
 } mem_PoolChunkType_t;
 
@@ -47,7 +48,8 @@ typedef enum {
                                         ((size) == 8 ? MEM_POOL_CHUNK_TYPE_8 : \
                                         ((size) == 16 ? MEM_POOL_CHUNK_TYPE_16 : \
                                         ((size) == 32 ? MEM_POOL_CHUNK_TYPE_32 : \
-                                        jerry_UnreferencedExpression))))
+                                        ((size) == 64 ? MEM_POOL_CHUNK_TYPE_64 : \
+                                        jerry_UnreferencedExpression)))))
 
 /**
  * Get chunk size from chunk type.
diff --git a/tests/unit/test_poolman.c b/tests/unit/test_poolman.c
index a76b13e2f..d254a360d 100644
--- a/tests/unit/test_poolman.c
+++ b/tests/unit/test_poolman.c
@@ -36,7 +36,7 @@ const size_t test_heap_size = 8 * 1024;
 const uint32_t test_iters = 16384;
 
 // Subiterations count
-const uint32_t test_max_sub_iters = 64;
+const uint32_t test_max_sub_iters = 32;
 
 int
 main( int __unused argc,