diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index af0368010..dbaefb3a6 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -341,41 +341,44 @@ tasks.withType(JavaCompile) {
                 "MultipleTopLevelClasses",
                 "MultiVariableDeclaration",
                 "AssertEqualsArgumentOrderChecker",
+                "EmptySetMultibindingContributions",
+                "MixedArrayDimensions",
+                "PackageLocation",
+                "UseBinds",
+                "IntLongMath",
+                "FloatCast",
+                "ReachabilityFenceUsage",
+                "StreamResourceLeak",
+                "TruthIncompatibleType",
+                "ByteBufferBackingArray",
+                "OrphanedFormatString",
+                "CatchAndPrintStackTrace",
+                "ObjectToString",
+                "AssertThrowsMultipleStatements",
+                "BoxedPrimitiveConstructor",
+                "SynchronizeOnNonFinalField",
+                "WildcardImport",
+                "FutureReturnValueIgnored",
+                "PrivateConstructorForNoninstantiableModule",
+                "ClassNewInstance",
+                "UnsafeFinalization",
+                "MutableMethodReturnType",
+                "SwitchDefault",
+                "VarTypeName",
+                "ArgumentSelectionDefectChecker",
+                "CompareToZero",
+                "NarrowingCompoundAssignment",
 //                "ReturnMissingNullable",
 //                "InconsistentOverloads",
 //                "MethodCanBeStatic",
 //                "Var",
 //                "ConstantField",
-//                "EmptySetMultibindingContributions",
-//                "MixedArrayDimensions",
-//                "PackageLocation",
-//                "PrivateConstructorForNoninstantiableModule",
 //                "UnnecessaryStaticImport",
-//                "UseBinds",
-//                "WildcardImport",
-//                "FutureReturnValueIgnored",
-//                "IntLongMath",
-//                "FloatCast",
-//                "ClassNewInstance",
 //                "ConstructorInvokesOverridable",
-//                "UnsafeFinalization",
-//                "MutableMethodReturnType",
-//                "SynchronizeOnNonFinalField",
-//                "SwitchDefault",
-//                "ReachabilityFenceUsage",
-//                "BoxedPrimitiveConstructor",
 //                "InjectOnConstructorOfAbstractClass",
-////                "StringSplitter",
+//                "StringSplitter",
 //                "UnnecessaryDefaultInEnumSwitch",
-//                "StreamResourceLeak",
-////                "InconsistentCapitalization",
-//                "TruthIncompatibleType",
-//                "ByteBufferBackingArray",
-//                "OrphanedFormatString",
-//                "CatchAndPrintStackTrace",
-//                "VarTypeName",
-//                "ObjectToString",
-//                "AssertThrowsMultipleStatements",
+//                "InconsistentCapitalization",
 //                "FieldCanBeFinal"
         )
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java
index b0b2644c1..071b2e482 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java
@@ -163,7 +163,6 @@ public class SavingsEnumerations {
                 optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.WITHDRAW_TRANSFER.getValue().longValue(),
                         SavingsAccountTransactionType.WITHDRAW_TRANSFER.getCode(), "Transfer Withdrawn");
             break;
-            default:
             case PAY_CHARGE:
                 optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.PAY_CHARGE.getValue().longValue(),
                         SavingsAccountTransactionType.PAY_CHARGE.getCode(), "Pay Charge");
@@ -200,6 +199,7 @@ public class SavingsEnumerations {
                 optionData = new SavingsAccountTransactionEnumData(SavingsAccountTransactionType.AMOUNT_RELEASE.getValue().longValue(),
                         SavingsAccountTransactionType.AMOUNT_RELEASE.getCode(), "Release Amount");
                 break;
+            default:
         }
         return optionData;
     }
@@ -839,4 +839,4 @@ public class SavingsEnumerations {
         }
         return optionData;
     }
-}
\ No newline at end of file
+}