diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp
index 093a07bd17..ab4a5977e7 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp
@@ -489,7 +489,7 @@ ecma_builtin_array_prototype_object_to_locale_string (const ecma_value_t this_ar
                   ecma_op_to_object (this_arg),
                   ret_value);
 
-  ecma_object_t *obj_p = ecma_get_object_from_completion_value (obj_value);
+  ecma_object_t *obj_p = ecma_get_object_from_value (obj_value);
 
   ecma_string_t *length_magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LENGTH);
 
@@ -532,7 +532,7 @@ ecma_builtin_array_prototype_object_to_locale_string (const ecma_value_t this_ar
                       ecma_builtin_helper_get_to_locale_string_at_index (obj_p, k),
                       ret_value);
 
-      ecma_string_t *next_string_p = ecma_get_string_from_completion_value (next_string_value);
+      ecma_string_t *next_string_p = ecma_get_string_from_value (next_string_value);
 
       ecma_deref_ecma_string (return_string_p);
 
@@ -1736,7 +1736,7 @@ ecma_builtin_array_prototype_object_every (ecma_value_t this_arg, /**< this argu
         ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value);
 
         /* 7.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */
-        if (!ecma_is_value_true (ecma_op_to_boolean (call_value)))
+        if (ecma_is_completion_value_normal_false (ecma_op_to_boolean (call_value)))
         {
           ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_FALSE);
         }
@@ -1837,7 +1837,7 @@ ecma_builtin_array_prototype_object_some (ecma_value_t this_arg, /**< this argum
         ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value);
 
         /* 7.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */
-        if (ecma_is_value_true (ecma_op_to_boolean (call_value)))
+        if (ecma_is_completion_value_normal_true (ecma_op_to_boolean (call_value)))
         {
           ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
         }
@@ -1944,7 +1944,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t this_arg, /**< this arg
         ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value);
 
         /* 9.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */
-        if (ecma_is_value_true (ecma_op_to_boolean (call_value)))
+        if (ecma_is_completion_value_normal_true (ecma_op_to_boolean (call_value)))
         {
           ecma_string_t* to_index_string_p = ecma_new_ecma_string_from_uint32 (new_array_index);
           /*
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp
index f7e413fab1..474355ff92 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp
@@ -670,7 +670,7 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
                     ecma_op_to_object (arg2),
                     ret_value);
 
-    ecma_object_t *props_p = ecma_get_object_from_completion_value (props);
+    ecma_object_t *props_p = ecma_get_object_from_value (props);
     ecma_property_t *property_p;
 
     // First we need to know how many properties should be stored
@@ -732,7 +732,7 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
 
       // 5.b
       ECMA_TRY_CATCH (conv_result,
-                      ecma_op_to_property_descriptor (ecma_get_completion_value_value (desc_obj),
+                      ecma_op_to_property_descriptor (desc_obj,
                                                       &property_descriptors[index]),
                       ret_value);
 
diff --git a/jerry-core/vm/opcodes-native-call.cpp b/jerry-core/vm/opcodes-native-call.cpp
index c5a5948efc..f2eab84377 100644
--- a/jerry-core/vm/opcodes-native-call.cpp
+++ b/jerry-core/vm/opcodes-native-call.cpp
@@ -41,7 +41,7 @@ opfunc_native_call (opcode_t opdata, /**< operation data */
 
   JERRY_STATIC_ASSERT (OPCODE_NATIVE_CALL__COUNT < (1u << (sizeof (native_call_id_idx) * JERRY_BITSINBYTE)));
 
-  ecma_completion_value_t ret_value = 0;
+  ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
 
   MEM_DEFINE_LOCAL_ARRAY (arg_values, args_number, ecma_value_t);