diff --git a/plugins/InspectionGadgets/Leftovers.txt b/plugins/InspectionGadgets/Leftovers.txt
index 345330e27d52..36691c0fce05 100644
--- a/plugins/InspectionGadgets/Leftovers.txt
+++ b/plugins/InspectionGadgets/Leftovers.txt
@@ -37,6 +37,7 @@
     QuickFix for "Integer division in floating point context"
     Quickfix for "Non-serializable class with..."
     Quickfix for "Unnecessary default"
+    More detectors and quickfixes for "Simplifiable JUnit Assertion"
 
 
     Inheritance as type def (change the EmptyClass inspection)
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java
index 1a2c91c05ee8..744fc9f5ebdd 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SimplifiableJUnitAssertionInspection.java
@@ -52,7 +52,7 @@ public class SimplifiableJUnitAssertionInspection extends ExpressionInspection {
             final PsiExpression[] args = argumentList.getExpressions();
             final int testPosition;
             final PsiExpression message;
-            if (paramType1.equals(stringType) && parameters.length > 2) {
+            if (paramType1.equals(stringType) && parameters.length >= 2) {
                 testPosition = 1;
                 message = args[0];
             } else {
@@ -88,7 +88,7 @@ public class SimplifiableJUnitAssertionInspection extends ExpressionInspection {
                 newExpression.append(',');
             }
             newExpression.append(lhs.getText());
-                newExpression.append(',');
+            newExpression.append(',');
             newExpression.append(rhs.getText());
             if(isFloatingPoint(lhs) || isFloatingPoint(rhs))
             {
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryLocalVariableInspection.java
index 3cfdaa7a5ed7..5101b10752b0 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryLocalVariableInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryLocalVariableInspection.java
@@ -82,7 +82,7 @@ public class UnnecessaryLocalVariableInspection extends StatementInspection {
         }
 
         final PsiVariable initialization = (PsiVariable) referent;
-        final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(variable);
+        final VariableAssignedVisitor visitor2 = new VariableAssignedVisitor(initialization);
         containingScope.accept(visitor2);
         if (visitor2.isAssigned()) {
             return false;
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/MissortedModifiersInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/MissortedModifiersInspection.java
index 795978b44bea..51415f449f30 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/MissortedModifiersInspection.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/MissortedModifiersInspection.java
@@ -2,6 +2,8 @@ package com.siyeh.igtest.style;
 
 final public class MissortedModifiersInspection
 {
+    private native static int foo2();
+
     static private int m_bar = 4;
     static public int m_baz = 4;
     static final public int m_baz2 = 4;