diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b8a4eee6a..66920c8098 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,8 +71,10 @@ endif()
 
 if(USING_TI)
   set(ENABLE_STATIC_LINK "ON")
+  set(ENABLE_STRIP       "OFF")
 
   set(ENABLE_STATIC_LINK_MESSAGE " (FORCED BY COMPILER)")
+  set(ENABLE_STRIP_MESSAGE       " (FORCED BY COMPILER)")
 endif()
 
 # Status messages
@@ -205,9 +207,7 @@ endif()
 
 # Strip binary
 if(ENABLE_STRIP AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-  if (USING_GCC OR USING_CLANG)
-    jerry_add_link_flags(-s)
-  endif()
+  jerry_add_link_flags(-s)
 endif()
 
 # External compiler & linker flags
diff --git a/jerry-core/ecma/operations/ecma-objects-general.c b/jerry-core/ecma/operations/ecma-objects-general.c
index faa6d92bf2..d94ec0d538 100644
--- a/jerry-core/ecma/operations/ecma-objects-general.c
+++ b/jerry-core/ecma/operations/ecma-objects-general.c
@@ -313,9 +313,7 @@ ecma_op_general_object_define_own_property (ecma_object_t *object_p, /**< the ob
   JERRY_ASSERT (property_desc_p->is_writable_defined || !property_desc_p->is_writable);
 
   /* 1. */
-  /* This #def just gets around the syntax/style checker... */
-#define extended_property_ref_initialization { { 0 } , 0 }
-  ecma_extended_property_ref_t ext_property_ref = extended_property_ref_initialization;
+  ecma_extended_property_ref_t ext_property_ref = { .property_ref.value_p = NULL, .property_p = NULL };
   ecma_property_t current_prop;
 
   current_prop = ecma_op_object_get_own_property (object_p,