diff --git a/core/LegacyLogger.cc b/core/LegacyLogger.cc
index 8853edd8dda3e859dc2bb93a2ff84db654eafec4..1602b2385d6a762cc04037c6fc01288f878b9578 100644
--- a/core/LegacyLogger.cc
+++ b/core/LegacyLogger.cc
@@ -2092,8 +2092,8 @@ char *LegacyLogger::get_file_name(size_t idx)
     case 'i': // %i -> log file index
       if (this->logfile_number_ != 1)
         ret_val = mputprintf(ret_val, "%lu", (unsigned long)idx);
-        i_present = TRUE;
-        break;
+      i_present = TRUE;
+      break;
     case '\0': // trailing single %: leave as it is
       i--; // to avoid over-indexing in next iteration
       // no break
diff --git a/core/Logger.cc b/core/Logger.cc
index 6c5e45f64cf2e898673276b424c0e7f75281d4e1..17d5c74d500004831efb7e9e9094bdb6c75a914f 100644
--- a/core/Logger.cc
+++ b/core/Logger.cc
@@ -592,14 +592,14 @@ void TTCN_Logger::set_executable_name(const char *argv_0)
   // Cut the '.exe' suffix from the end (if present).
   if (name_end >= 4 && !strncasecmp(argv_0 + name_end - 4, ".exe", 4))
     name_end -= 4;
-    size_t name_begin = 0;
-    // Find the last '/' (if present) to cut the leading directory part.
-    for (int i = name_end - 1; i >= 0; i--) {
-      if (argv_0[i] == '/') {
-        name_begin = i + 1;
-        break;
-      }
+  size_t name_begin = 0;
+  // Find the last '/' (if present) to cut the leading directory part.
+  for (int i = name_end - 1; i >= 0; i--) {
+    if (argv_0[i] == '/') {
+      name_begin = i + 1;
+      break;
     }
+  }
   int name_len = name_end - name_begin;
   if (name_len > 0) {
     executable_name = (char*)Malloc(name_len + 1);
diff --git a/core2/Basetype2.cc b/core2/Basetype2.cc
index 86171c571ab30b3c58ac2d8a55c8528d0a0fc7a5..5606289667d484f54496dc15a48c515efb43016e 100644
--- a/core2/Basetype2.cc
+++ b/core2/Basetype2.cc
@@ -1903,7 +1903,7 @@ void Record_Of_Type::decode(const TTCN_Typedescriptor_t& p_td,
     if(RAW_decode(p_td, p_buf, p_buf.get_len()*8, order)<0)
       ec.error(TTCN_EncDec::ET_INCOMPL_MSG,"Can not decode type '%s', "
                  "because invalid or incomplete message was received", p_td.name);
-      break;}
+    break;}
   case TTCN_EncDec::CT_TEXT: {
     Limit_Token_List limit;
     TTCN_EncDec_ErrorContext ec("While TEXT-decoding type '%s': ", p_td.name);