diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index 6c29c393f..9cb39c4ff 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -303,6 +303,8 @@
         <property name="setterCanReturnItsClass" value="true"/>
     </module>
 
+    <module name="ModifiedControlVariable"/>
+
 <!--
     <module name="AvoidInlineConditionals"/>
     <module name="ClassDataAbstractionCoupling"/>
@@ -317,7 +319,6 @@
     <module name="JavadocTagContinuationIndentation"/>
     <module name="JavaNCSS"/>
     <module name="MissingCtor"/>
-    <module name="ModifiedControlVariable"/>
     <module name="MultipleStringLiterals"/>
     <module name="NPathComplexity"/>
     <module name="OneTopLevelClass"/>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
index 6345e6d7a..8f1248ba8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java
@@ -217,11 +217,12 @@ public class SuppressWarningsHolder
             final List<Entry> entries = ENTRIES.get();
             if (entries != null) {
                 for (String value : values) {
+                    String checkName = value;
                     // strip off the checkstyle-only prefix if present
                     if (value.startsWith(CHECKSTYLE_PREFIX)) {
-                        value = value.substring(CHECKSTYLE_PREFIX.length());
+                        checkName = checkName.substring(CHECKSTYLE_PREFIX.length());
                     }
-                    entries.add(new Entry(value, firstLine, firstColumn,
+                    entries.add(new Entry(checkName, firstLine, firstColumn,
                         lastLine, lastColumn));
                 }
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
index c4f7f3c54..8350e88f8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
@@ -208,7 +208,7 @@ public final class MissingDeprecatedCheck extends Check {
 
         boolean found = false;
         for (int reindex = i + 1;
-            reindex < lines.length; reindex++) {
+            reindex < lines.length;) {
             final Matcher multilineCont = MATCH_DEPRECATED_MULTILINE_CONT.matcher(lines[reindex]);
 
             if (multilineCont.find()) {
@@ -231,6 +231,7 @@ public final class MissingDeprecatedCheck extends Check {
                     found = true;
                 }
             }
+            reindex++;
         }
         return found;
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
index d07c7a070..2e3ac51be 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java
@@ -294,7 +294,7 @@ public class JavadocStyleCheck
      */
     private static int findTextStart(String line) {
         int textStart = -1;
-        for (int i = 0; i < line.length(); i++) {
+        for (int i = 0; i < line.length();) {
             if (!Character.isWhitespace(line.charAt(i))) {
                 if (line.regionMatches(i, "/**", 0, "/**".length())) {
                     i += 2;
@@ -307,6 +307,7 @@ public class JavadocStyleCheck
                     break;
                 }
             }
+            i++;
         }
         return textStart;
     }