diff --git a/src/node_file.cc b/src/node_file.cc
index c9bbea1ee5f621..a5abd6005efe5c 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -539,7 +539,6 @@ static void InternalModuleStat(const FunctionCallbackInfo<Value>& args) {
 
 static void Stat(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
-  Local<Context> context = env->context();
 
   CHECK_GE(args.Length(), 1);
 
@@ -563,7 +562,6 @@ static void Stat(const FunctionCallbackInfo<Value>& args) {
 
 static void LStat(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
-  Local<Context> context = env->context();
 
   CHECK_GE(args.Length(), 1);
 
diff --git a/src/node_i18n.cc b/src/node_i18n.cc
index 041eda94f3bdd5..71ae6a000336e2 100644
--- a/src/node_i18n.cc
+++ b/src/node_i18n.cc
@@ -788,7 +788,8 @@ static int GetColumnWidth(UChar32 codepoint,
       if (ambiguous_as_full_width) {
         return 2;
       }
-      // Fall through if ambiguous_as_full_width if false.
+      // If ambiguous_as_full_width is false:
+      // Fall through
     case U_EA_NEUTRAL:
       if (u_hasBinaryProperty(codepoint, UCHAR_EMOJI_PRESENTATION)) {
         return 2;