diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52ab6eccc..963b6166c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,6 +252,10 @@ project (Jerry CXX C ASM)
  set(LINKER_FLAGS_COMMON "${LINKER_FLAGS_COMMON} ${LINKER_FLAGS_COMMON_${PLATFORM_EXT}}")
  set(SOURCE_JERRY_STANDALONE_MAIN ${SOURCE_JERRY_STANDALONE_MAIN_${PLATFORM_EXT}})
 
+# Definitions
+ # Memory statistics
+  set(DEFINES_MEMORY_STATISTICS MEM_STATS)
+
 # Component targets
  # Jerry's libc
   if(NOT ${USE_EXTERNAL_LIBC})
@@ -274,16 +278,15 @@ project (Jerry CXX C ASM)
   set(LIBC_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}}.jerry-libc.${PLATFORM_L}.lib)
 
   function(declare_target_with_modifiers ) # modifiers are passed in ARGN implicit argument
+   set(DEFINES_JERRY)
    set(CORE_TARGET_NAME ${BUILD_MODE_PREFIX_${BUILD_MODE}})
    foreach(MODIFIER ${ARGN})
     set(TARGET_NAME ${TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}})
-
     set(CORE_TARGET_NAME ${CORE_TARGET_NAME}${MODIFIER_SUFFIX_${MODIFIER}})
+    set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_${MODIFIER}})
    endforeach()
    set(CORE_TARGET_NAME ${CORE_TARGET_NAME}.jerry-core)
 
-   set(DEFINES_JERRY )
-
    if(NOT ${EXTERNAL_BUILD})
     add_executable(${TARGET_NAME} ${SOURCE_JERRY_STANDALONE_MAIN})
 
diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 10aafabbd..c48dd94b8 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -66,9 +66,6 @@ project (JerryCore CXX C ASM)
        CONFIG_ECMA_COMPACT_PROFILE_DISABLE_JSON_BUILTIN
        CONFIG_ECMA_COMPACT_PROFILE_DISABLE_REGEXP_BUILTIN)
 
- # Memory statistics
-  set(DEFINES_JERRY_MEMORY_STATISTICS MEM_STATS)
-
  # Valgrind
   set(DEFINES_JERRY_VALGRIND JERRY_VALGRIND)
 
diff --git a/jerry-core/mem/mem-allocator.cpp b/jerry-core/mem/mem-allocator.cpp
index a4cab1b3b..146607591 100644
--- a/jerry-core/mem/mem-allocator.cpp
+++ b/jerry-core/mem/mem-allocator.cpp
@@ -72,11 +72,11 @@ mem_finalize (bool is_show_mem_stats) /**< show heap memory stats
             "  Peak pools: %lu\n"
             "  Peak allocated chunks: %lu\n\n",
             MEM_POOL_CHUNK_SIZE,
-            stats.pools_count,
-            stats.allocated_chunks,
-            stats.free_chunks,
-            stats.peak_pools_count,
-            stats.peak_allocated_chunks);
+            (unsigned long) stats.pools_count,
+            (unsigned long) stats.allocated_chunks,
+            (unsigned long) stats.free_chunks,
+            (unsigned long) stats.peak_pools_count,
+            (unsigned long) stats.peak_allocated_chunks);
 #endif /* MEM_STATS */
   }
 
diff --git a/jerry-core/mem/mem-heap.cpp b/jerry-core/mem/mem-heap.cpp
index 1e025ea7f..d4939c5c5 100644
--- a/jerry-core/mem/mem-heap.cpp
+++ b/jerry-core/mem/mem-heap.cpp
@@ -973,17 +973,17 @@ mem_heap_print (bool dump_block_headers, /**< print block headers */
             "  Peak allocated chunks count = %lu\n"
             "  Peak allocated= %lu bytes\n"
             "  Peak waste = %lu bytes\n",
-            mem_heap_stats.size,
+            (uint64_t) mem_heap_stats.size,
             (uint64_t) MEM_HEAP_CHUNK_SIZE,
-            mem_heap_stats.blocks,
-            mem_heap_stats.allocated_blocks,
-            mem_heap_stats.allocated_chunks,
-            mem_heap_stats.allocated_bytes,
-            mem_heap_stats.waste_bytes,
-            mem_heap_stats.peak_allocated_blocks,
-            mem_heap_stats.peak_allocated_chunks,
-            mem_heap_stats.peak_allocated_bytes,
-            mem_heap_stats.peak_waste_bytes);
+            (uint64_t) mem_heap_stats.blocks,
+            (uint64_t) mem_heap_stats.allocated_blocks,
+            (uint64_t) mem_heap_stats.allocated_chunks,
+            (uint64_t) mem_heap_stats.allocated_bytes,
+            (uint64_t) mem_heap_stats.waste_bytes,
+            (uint64_t) mem_heap_stats.peak_allocated_blocks,
+            (uint64_t) mem_heap_stats.peak_allocated_chunks,
+            (uint64_t) mem_heap_stats.peak_allocated_bytes,
+            (uint64_t) mem_heap_stats.peak_waste_bytes);
   }
 #else /* MEM_STATS */
   (void) dump_stats;