diff --git a/megamek/src/megamek/common/MiscType.java b/megamek/src/megamek/common/MiscType.java
index 07ca94d7722..94c85d26a76 100644
--- a/megamek/src/megamek/common/MiscType.java
+++ b/megamek/src/megamek/common/MiscType.java
@@ -455,10 +455,9 @@ public boolean isVariableSize() {
 
     @Override
     public Double variableStepSize() {
-        if (hasFlag(F_CARGO) || hasFlag(F_LIQUID_CARGO)) {
+        if (hasFlag(F_CARGO) || hasFlag(F_LIQUID_CARGO) || hasFlag(F_CARGOLIFTER)) {
             return 0.5;
-        }
-        if (hasFlag(F_LADDER)) {
+        } else if (hasFlag(F_LADDER)) {
             return 20.0;
         }
         return super.variableStepSize();
diff --git a/megamek/src/megamek/common/verifier/TestBattleArmor.java b/megamek/src/megamek/common/verifier/TestBattleArmor.java
index b611b442e88..b1add802f8f 100644
--- a/megamek/src/megamek/common/verifier/TestBattleArmor.java
+++ b/megamek/src/megamek/common/verifier/TestBattleArmor.java
@@ -188,19 +188,19 @@ public enum BAManipulator {
          * The type, corresponding to types defined in
          * <code>EquipmentType</code>.
          */
-        public int type;
+        public final int type;
 
         /**
          * The name of this manipulator
          */
-        public String internalName;
+        public final String internalName;
 
-        public String displayName;
+        public final String displayName;
 
         /**
          * Denotes whether this armor is Clan or not.
          */
-        public boolean pairMounted;
+        public final boolean pairMounted;
 
         BAManipulator(int t, boolean p) {
             type = t;
@@ -209,10 +209,6 @@ public enum BAManipulator {
             pairMounted = p;
         }
 
-        public static int getNumBAArmors() {
-            return values().length;
-        }
-
         /**
          * Given an manipulator internal name, return the
          * <code>BAManipulator</code> instance that represents that internal