diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c
index eb81b00c9..7a8504d4a 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c
@@ -113,7 +113,7 @@ ecma_builtin_regexp_prototype_flags_helper (ecma_extended_object_t *re_obj_p, /*
   };
 
   uint16_t offset = (uint16_t) (builtin_routine_id - ECMA_REGEXP_PROTOTYPE_ROUTINE_GET_GLOBAL);
-  return ecma_make_boolean_value (flags & re_flags[offset]);
+  return ecma_make_boolean_value ((flags & re_flags[offset]) != 0);
 } /* ecma_builtin_regexp_prototype_flags_helper */
 
 /**
diff --git a/jerry-core/parser/js/js-scanner-util.c b/jerry-core/parser/js/js-scanner-util.c
index f223a0d9c..86c4ca1c4 100644
--- a/jerry-core/parser/js/js-scanner-util.c
+++ b/jerry-core/parser/js/js-scanner-util.c
@@ -625,7 +625,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */
       {
         compressed_size += 2 + 1;
       }
-      else if (diff >= -UINT8_MAX && diff <= UINT16_MAX)
+      else if (diff >= -UINT8_MAX && diff <= (intptr_t) UINT16_MAX)
       {
         compressed_size += 2 + 2;
       }
@@ -888,7 +888,7 @@ scanner_pop_literal_pool (parser_context_t *context_p, /**< context */
       {
         data_p[-1] = (uint8_t) diff;
       }
-      else if (diff >= -UINT8_MAX && diff <= UINT16_MAX)
+      else if (diff >= -UINT8_MAX && diff <= (intptr_t) UINT16_MAX)
       {
         if (diff < 0)
         {