diff --git a/jerry-core/parser/js/js-parser-internal.h b/jerry-core/parser/js/js-parser-internal.h
index 785aa7e70a..069de5db75 100644
--- a/jerry-core/parser/js/js-parser-internal.h
+++ b/jerry-core/parser/js/js-parser-internal.h
@@ -29,7 +29,7 @@
   package bp_info[128]; 
   jmem_cpointer_t debug_bytecode_data_cp;      /* < Compressed main program byte code pointer*/
   jmem_cpointer_t debug_func_bytecode_data_cp; /* < Compressed function byte code pointer*/
-#endif /* PARSER_DEBUG */
+#endif /* !PARSER_DEBUG */
 
 /** \addtogroup parser Parser
  * @{
diff --git a/jerry-core/parser/js/js-parser-statm.c b/jerry-core/parser/js/js-parser-statm.c
index fdda27fb8c..c194062f6f 100644
--- a/jerry-core/parser/js/js-parser-statm.c
+++ b/jerry-core/parser/js/js-parser-statm.c
@@ -376,7 +376,7 @@ parser_parse_function_statement (parser_context_t *context_p) /**< context */
 
     function_name_t.type = FUNCTION_NAME; // Type 2 is the parsed function name
     function_name_t.msg_len = name_p->prop.length;
-    memcpy(function_name_t.msg, (char*)name_p->u.char_p, function_name_t.msg_len);
+    memcpy(function_name_t.msg, name_p->u.char_p, function_name_t.msg_len);
 
     send(connection, &function_name_t, sizeof(function_name_t), 0);
   }
diff --git a/jerry-main/main-unix.c b/jerry-main/main-unix.c
index 6128a54606..3a411b38cd 100644
--- a/jerry-main/main-unix.c
+++ b/jerry-main/main-unix.c
@@ -71,10 +71,7 @@ read_file (const char *file_name,
   source_file_t.msg_len = strlen(file_name);
   memcpy(source_file_t.msg, file_name, source_file_t.msg_len + 1);
 
-  // sender(&source_file_t, sizeof(&source_file_t));
   send(connection, &source_file_t, sizeof(source_file_t), 0); 
-  // size_t file_name_len = strlen(file_name);
-  // send_function_to_client(file_name, (uint16_t)file_name_len);
   #endif /* !PARSER_DEBUG */
   
   fclose (file);
@@ -392,12 +389,6 @@ main (int argc,
         }
       }
 
-      // #ifdef PARSER_DEBUG
-      // const char *eof_file = " ";
-      // size_t file_name_len = strlen(eof_file);
-      // send_function_to_client(eof_file, (uint16_t)file_name_len, 0);
-      // #endif /* !PARSER_DEBUG */
-
       if (jerry_value_has_error_flag (ret_value))
       {
         break;