diff --git a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
index 8eea9a4d4..93627870b 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
@@ -340,9 +340,6 @@ public class ClassGen {
 	}
 
 	private String useClassInternal(ClassInfo useCls, ClassInfo classInfo) {
-		if (parentGen != null) {
-			return parentGen.useClassInternal(useCls, classInfo);
-		}
 		String clsStr = classInfo.getFullName();
 		if (fallback) {
 			return clsStr;
@@ -372,11 +369,19 @@ public class ClassGen {
 					}
 				}
 			}
-			imports.add(classInfo);
+			addImport(classInfo);
 			return shortName;
 		}
 	}
 
+	private void addImport(ClassInfo classInfo) {
+		if (parentGen != null) {
+			parentGen.addImport(classInfo);
+		} else {
+			imports.add(classInfo);
+		}
+	}
+
 	private static boolean isClassInnerFor(ClassInfo inner, ClassInfo parent) {
 		if (inner.isInner()) {
 			ClassInfo p = inner.getParentClass();
@@ -393,9 +398,11 @@ public class ClassGen {
 			return true;
 		}
 		ClassNode classNode = dex.resolveClass(useCls);
-		for (ClassNode inner : classNode.getInnerClasses()) {
-			if (inner.getShortName().equals(shortName)) {
-				return true;
+		if (classNode != null) {
+			for (ClassNode inner : classNode.getInnerClasses()) {
+				if (inner.getShortName().equals(shortName)) {
+					return true;
+				}
 			}
 		}
 		return searchCollision(dex, useCls.getParentClass(), shortName);
diff --git a/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java b/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
index a96395a63..3d9806e74 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
@@ -101,7 +101,7 @@ public class InsnGen {
 				return sfield(f.getField());
 			} else {
 				RegisterArg regArg = new RegisterArg(f.getRegNum());
-				regArg.setTypedVar(f.getTypedVar());
+				regArg.replaceTypedVar(f);
 				return ifield(f.getField(), regArg);
 			}
 		} else {
@@ -281,13 +281,14 @@ public class InsnGen {
 
 			case INSTANCE_OF: {
 				boolean wrap = state.contains(IGState.BODY_ONLY);
-				if (wrap)
-					code.add("(");
+				if (wrap) {
+					code.add('(');
+				}
 				code.add(arg(insn, 0));
 				code.add(" instanceof ");
 				code.add(useType((ArgType) ((IndexInsnNode) insn).getIndex()));
 				if (wrap) {
-					code.add(")");
+					code.add(')');
 				}
 				break;
 			}
diff --git a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java b/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
index 5993df22b..87b492cd9 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
@@ -218,13 +218,6 @@ public class MethodGen {
 		return r;
 	}
 
-	private void makeInitCode(CodeWriter code) throws CodegenException {
-		InsnGen igen = new InsnGen(this, mth, fallback);
-		// generate super call
-		if (mth.getSuperCall() != null)
-			igen.makeInsn(mth.getSuperCall(), code);
-	}
-
 	public CodeWriter makeInstructions(int mthIndent) throws CodegenException {
 		CodeWriter code = new CodeWriter(mthIndent + 1);
 
@@ -252,7 +245,6 @@ public class MethodGen {
 					LOG.debug(ErrorsCounter.formatErrorMsg(mth, " Inconsistent code"));
 					// makeMethodDump(code, mth);
 				}
-				makeInitCode(code);
 				code.add(insns);
 			} else {
 				makeFallbackMethod(code, mth);
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/BlockRegState.java b/jadx-core/src/main/java/jadx/core/dex/attributes/BlockRegState.java
index eac16cd6f..3f4060887 100644
--- a/jadx-core/src/main/java/jadx/core/dex/attributes/BlockRegState.java
+++ b/jadx-core/src/main/java/jadx/core/dex/attributes/BlockRegState.java
@@ -21,18 +21,19 @@ public final class BlockRegState {
 	}
 
 	public void assignReg(RegisterArg arg) {
-		int rn = arg.getRegNum();
-		regs[rn] = new RegisterArg(rn, arg.getType());
-		use(arg);
+		regs[arg.getRegNum()] = arg;
+		arg.getTypedVar().getUseList().add(arg);
 	}
 
 	public void use(RegisterArg arg) {
-		TypedVar regType = regs[arg.getRegNum()].getTypedVar();
+		RegisterArg reg = regs[arg.getRegNum()];
+		TypedVar regType = reg.getTypedVar();
 		if (regType == null) {
 			regType = new TypedVar(arg.getType());
-			regs[arg.getRegNum()].setTypedVar(regType);
+			reg.forceSetTypedVar(regType);
 		}
-		regType.use(arg);
+		arg.replaceTypedVar(reg);
+		reg.getTypedVar().getUseList().add(arg);
 	}
 
 	public RegisterArg getRegister(int r) {
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/ImmutableTypedVar.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/ImmutableTypedVar.java
index 6702a4862..52536f619 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/ImmutableTypedVar.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/ImmutableTypedVar.java
@@ -2,13 +2,17 @@ package jadx.core.dex.instructions.args;
 
 public class ImmutableTypedVar extends TypedVar {
 
-	public ImmutableTypedVar(ArgType initType) {
-		super(initType);
+	public ImmutableTypedVar(ArgType type) {
+		super(type);
 	}
 
 	@Override
-	public boolean forceSetType(ArgType newType) {
-		return false;
+	public boolean isImmutable() {
+		return true;
+	}
+
+	@Override
+	public void forceSetType(ArgType newType) {
 	}
 
 	@Override
@@ -17,7 +21,7 @@ public class ImmutableTypedVar extends TypedVar {
 	}
 
 	@Override
-	public boolean merge(ArgType mtype) {
+	public boolean merge(ArgType type) {
 		return false;
 	}
 }
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
index 362bb3bf1..b19d0f9d8 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
@@ -21,6 +21,12 @@ public abstract class InsnArg extends Typed {
 		return reg(InsnUtils.getArg(insn, argNum), type);
 	}
 
+	public static RegisterArg immutableReg(int regNum, ArgType type) {
+		RegisterArg r = new RegisterArg(regNum);
+		r.forceSetTypedVar(new ImmutableTypedVar(type));
+		return r;
+	}
+
 	public static LiteralArg lit(long literal, ArgType type) {
 		return new LiteralArg(literal, type);
 	}
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
index 73a8551e4..cd3782c1b 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
@@ -88,13 +88,14 @@ public class RegisterArg extends InsnArg {
 	public boolean isThis() {
 		if (isRegister()) {
 			String name = getTypedVar().getName();
-			if (name != null && name.equals("this"))
+			if (name != null && name.equals("this")) {
 				return true;
-
+			}
 			// maybe it was moved from 'this' register
 			InsnNode ai = getAssignInsn();
 			if (ai != null && ai.getType() == InsnType.MOVE) {
-				if (ai.getArg(0).isThis()) {
+				InsnArg arg = ai.getArg(0);
+				if (arg != this && arg.isThis()) {
 					// actually we need to remove this instruction but we can't
 					// because of iterating on instructions list
 					// so unbind insn and rely on code shrinker
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java
index 5da151a75..9d71449f1 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java
@@ -1,17 +1,15 @@
 package jadx.core.dex.instructions.args;
 
+import java.util.List;
+
 public abstract class Typed {
 
-	protected TypedVar typedVar;
+	TypedVar typedVar;
 
 	public TypedVar getTypedVar() {
 		return typedVar;
 	}
 
-	public void setTypedVar(TypedVar arg) {
-		this.typedVar = arg;
-	}
-
 	public ArgType getType() {
 		return typedVar.getType();
 	}
@@ -24,26 +22,50 @@ public abstract class Typed {
 		return typedVar.merge(var);
 	}
 
-	public void replace(Typed var) {
-		replace(var.getTypedVar());
+	public void forceSetTypedVar(TypedVar arg) {
+		this.typedVar = arg;
 	}
 
-	public void replace(TypedVar newVar) {
-		if (typedVar == newVar)
-			return;
+	public void mergeDebugInfo(Typed arg) {
+		merge(arg);
+		mergeName(arg);
+	}
 
-		if (typedVar != null) {
-			newVar.merge(typedVar);
-			for (InsnArg arg : typedVar.getUseList()) {
-				if (arg != this)
-					arg.setTypedVar(newVar);
-			}
-			newVar.getUseList().addAll(typedVar.getUseList());
-			if (typedVar.getName() != null)
-				newVar.setName(typedVar.getName());
-			typedVar.getUseList().clear();
+	protected void mergeName(Typed arg) {
+		getTypedVar().mergeName(arg.getTypedVar());
+	}
+
+	public boolean replaceTypedVar(Typed var) {
+		TypedVar curVar = this.typedVar;
+		TypedVar newVar = var.typedVar;
+		if (curVar == newVar) {
+			return false;
 		}
-		typedVar = newVar;
+		if (curVar != null) {
+			if (curVar.isImmutable()) {
+				moveInternals(newVar, curVar);
+			} else {
+				newVar.merge(curVar);
+				moveInternals(curVar, newVar);
+				this.typedVar = newVar;
+			}
+		} else {
+			this.typedVar = newVar;
+		}
+		return true;
 	}
 
+	private void moveInternals(TypedVar from, TypedVar to) {
+		List<InsnArg> curUseList = from.getUseList();
+		if (curUseList.size() != 0) {
+			for (InsnArg arg : curUseList) {
+				if (arg != this) {
+					arg.forceSetTypedVar(to);
+				}
+			}
+			to.getUseList().addAll(curUseList);
+			curUseList.clear();
+		}
+		to.mergeName(from);
+	}
 }
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypedVar.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypedVar.java
index 35bd1b24a..78ad8e11c 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypedVar.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/TypedVar.java
@@ -20,13 +20,8 @@ public class TypedVar {
 	/**
 	 * This method must be used very carefully
 	 */
-	public boolean forceSetType(ArgType newType) {
-		if (!newType.equals(type)) {
-			type = newType;
-			return true;
-		} else {
-			return false;
-		}
+	public void forceSetType(ArgType newType) {
+		type = newType;
 	}
 
 	public boolean merge(TypedVar typedVar) {
@@ -43,11 +38,6 @@ public class TypedVar {
 		}
 	}
 
-	public void use(InsnArg arg) {
-		arg.replace(this);
-		useList.add(arg);
-	}
-
 	public List<InsnArg> getUseList() {
 		return useList;
 	}
@@ -60,6 +50,19 @@ public class TypedVar {
 		this.name = name;
 	}
 
+	public void mergeName(TypedVar arg) {
+		String name = arg.getName();
+		if (name != null) {
+			setName(name);
+		} else if (getName() != null) {
+			arg.setName(getName());
+		}
+	}
+
+	public boolean isImmutable() {
+		return false;
+	}
+
 	@Override
 	public int hashCode() {
 		return type.hashCode() * 31 + (name == null ? 0 : name.hashCode());
@@ -69,7 +72,7 @@ public class TypedVar {
 	public boolean equals(Object obj) {
 		if (this == obj) return true;
 		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
+		if (!(obj instanceof TypedVar)) return false;
 		TypedVar other = (TypedVar) obj;
 		if (!type.equals(other.type)) return false;
 		if (name == null) {
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
index 165f4a15b..7ec8fe206 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
@@ -291,6 +291,10 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 		innerClasses.add(cls);
 	}
 
+	public boolean isEnum() {
+		return getAccessFlags().isEnum() && getSuperClass().getFullName().equals(Consts.CLASS_ENUM);
+	}
+
 	public boolean isAnonymous() {
 		boolean simple = false;
 		for (MethodNode m : methods) {
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
index 3ecfcfcd7..290c87f09 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
@@ -125,10 +125,11 @@ public class InsnNode extends LineAttrNode {
 
 	public void getRegisterArgs(List<RegisterArg> list) {
 		for (InsnArg arg : this.getArguments()) {
-			if (arg.isRegister())
+			if (arg.isRegister()) {
 				list.add((RegisterArg) arg);
-			else if (arg.isInsnWrap())
+			} else if (arg.isInsnWrap()) {
 				((InsnWrapArg) arg).getWrapInsn().getRegisterArgs(list);
+			}
 		}
 	}
 
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
index 6b8254229..b9e1abd37 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
@@ -17,7 +17,6 @@ import jadx.core.dex.instructions.SwitchNode;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.instructions.args.RegisterArg;
-import jadx.core.dex.instructions.mods.ConstructorInsn;
 import jadx.core.dex.nodes.parser.DebugInfoParser;
 import jadx.core.dex.trycatch.ExcHandlerAttr;
 import jadx.core.dex.trycatch.ExceptionHandler;
@@ -61,8 +60,6 @@ public class MethodNode extends LineAttrNode implements ILoadable {
 	private BlockNode enterBlock;
 	private List<BlockNode> exitBlocks;
 
-	private ConstructorInsn superCall;
-
 	private IContainer region;
 	private List<ExceptionHandler> exceptionHandlers;
 	private List<LoopAttr> loops = Collections.emptyList();
@@ -204,22 +201,19 @@ public class MethodNode extends LineAttrNode implements ILoadable {
 			for (ArgType arg : args)
 				pos -= arg.getRegCount();
 		}
-
 		if (accFlags.isStatic()) {
 			thisArg = null;
 		} else {
-			thisArg = InsnArg.reg(pos - 1, parentClass.getClassInfo().getType());
+			thisArg = InsnArg.immutableReg(pos - 1, parentClass.getClassInfo().getType());
 			thisArg.getTypedVar().setName("this");
 		}
-
 		if (args.isEmpty()) {
 			argsList = Collections.emptyList();
 			return;
 		}
-
 		argsList = new ArrayList<RegisterArg>(args.size());
 		for (ArgType arg : args) {
-			argsList.add(InsnArg.reg(pos, arg));
+			argsList.add(InsnArg.immutableReg(pos, arg));
 			pos += arg.getRegCount();
 		}
 	}
@@ -483,14 +477,6 @@ public class MethodNode extends LineAttrNode implements ILoadable {
 		return accFlags;
 	}
 
-	public void setSuperCall(ConstructorInsn insn) {
-		this.superCall = insn;
-	}
-
-	public ConstructorInsn getSuperCall() {
-		return this.superCall;
-	}
-
 	public IContainer getRegion() {
 		return region;
 	}
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java b/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
index 7eebd5c73..14a57d87e 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
@@ -94,7 +94,6 @@ public class RootNode {
 
 	public ClassNode resolveClass(ClassInfo cls) {
 		String fullName = cls.getFullName();
-		ClassNode rCls = searchClassByName(fullName);
-		return rCls;
+		return searchClassByName(fullName);
 	}
 }
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/DebugInfoParser.java b/jadx-core/src/main/java/jadx/core/dex/nodes/parser/DebugInfoParser.java
index c6b199f25..5af846219 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/DebugInfoParser.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/parser/DebugInfoParser.java
@@ -211,8 +211,9 @@ public class DebugInfoParser {
 
 	private static void merge(InsnArg arg, LocalVar var) {
 		if (arg != null && arg.isRegister()) {
-			if (var.getRegNum() == ((RegisterArg) arg).getRegNum())
-				arg.setTypedVar(var.getTypedVar());
+			if (var.getRegNum() == ((RegisterArg) arg).getRegNum()) {
+				arg.mergeDebugInfo(var);
+			}
 		}
 	}
 }
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java b/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java
index 3fbcadf99..62e65c189 100644
--- a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java
+++ b/jadx-core/src/main/java/jadx/core/dex/nodes/parser/LocalVar.java
@@ -33,7 +33,7 @@ final class LocalVar extends RegisterArg {
 		}
 		TypedVar tv = new TypedVar(type);
 		tv.setName(name);
-		setTypedVar(tv);
+		forceSetTypedVar(tv);
 	}
 
 	public void start(int addr, int line) {
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java b/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
index 682e89e55..b189aff3e 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
@@ -34,11 +34,9 @@ public class ClassModifier extends AbstractVisitor {
 			if (af.isConstructor()
 					&& af.isPublic()
 					&& mth.getArguments(false).isEmpty()) {
-				if (mth.getSuperCall() == null) {
-					List<BlockNode> bb = mth.getBasicBlocks();
-					if (bb.isEmpty() || allBlocksEmpty(bb)) {
-						it.remove();
-					}
+				List<BlockNode> bb = mth.getBasicBlocks();
+				if (bb.isEmpty() || allBlocksEmpty(bb)) {
+					it.remove();
 				}
 			}
 		}
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java b/jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
index ef4163cc8..f58a8ece6 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
@@ -60,7 +60,7 @@ public class CodeShrinker extends AbstractVisitor {
 						InsnArg useInsnArg = selectOther(useList, result);
 						InsnNode useInsn = useInsnArg.getParentInsn();
 						if (useInsn == null) {
-							LOG.debug("parent insn null in " + useInsnArg + " from " + insn + " mth: " + mth);
+							LOG.debug("parent insn null: {}, mth: {}", insn, mth);
 						} else if (useInsn != insn) {
 							boolean wrap = false;
 							// TODO
@@ -213,7 +213,7 @@ public class CodeShrinker extends AbstractVisitor {
 									}
 									RegisterArg fArg = new FieldArg(field, reg != null ? reg.getRegNum() : -1);
 									if (reg != null) {
-										fArg.setTypedVar(get.getArg(0).getTypedVar());
+										fArg.replaceTypedVar(get.getArg(0));
 									}
 									if (wrapType == InsnType.ARITH) {
 										ArithNode ar = (ArithNode) wrap;
@@ -269,9 +269,9 @@ public class CodeShrinker extends AbstractVisitor {
 
 	public static InsnArg inlineArgument(MethodNode mth, RegisterArg arg) {
 		InsnNode assignInsn = arg.getAssignInsn();
-		if (assignInsn == null)
+		if (assignInsn == null) {
 			return null;
-
+		}
 		// recursively wrap all instructions
 		List<RegisterArg> list = new ArrayList<RegisterArg>();
 		List<RegisterArg> args = mth.getArguments(false);
@@ -281,17 +281,18 @@ public class CodeShrinker extends AbstractVisitor {
 			assignInsn.getRegisterArgs(list);
 			for (RegisterArg rarg : list) {
 				InsnNode ai = rarg.getAssignInsn();
-				if (ai != assignInsn && ai != null
-						&& rarg.getParentInsn() != ai)
+				if (ai != assignInsn && ai != null && ai != rarg.getParentInsn()) {
 					rarg.wrapInstruction(ai);
+				}
 			}
 			// remove method args
 			if (list.size() != 0 && args.size() != 0) {
 				list.removeAll(args);
 			}
 			i++;
-			if (i > 1000)
+			if (i > 1000) {
 				throw new JadxRuntimeException("Can't inline arguments for: " + arg + " insn: " + assignInsn);
+			}
 		} while (!list.isEmpty());
 
 		return arg.wrapInstruction(assignInsn);
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
index 012f7d2c8..880df4bdc 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
@@ -69,7 +69,6 @@ public class DotGraphVisitor extends AbstractVisitor {
 				+ mth.getParentClass().getFullName() + "." + mth.getName()
 				+ "(" + Utils.listToString(mth.getArguments(true)) + ") ")
 				+ (attrs.length() == 0 ? "" : " | " + attrs)
-				+ (mth.getSuperCall() != null ? "| Super call: " + escape(mth.getSuperCall().toString()) : "")
 				+ "}\"];");
 
 		dot.startLine("MethodNode -> " + makeName(mth.getEnterBlock()) + ";");
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java
index ae43caa5f..6f36e3a80 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java
@@ -30,8 +30,7 @@ public class EnumVisitor extends AbstractVisitor {
 
 	@Override
 	public boolean visit(ClassNode cls) throws JadxException {
-		if (!cls.getAccessFlags().isEnum()
-				|| !cls.getSuperClass().getFullName().equals("java.lang.Enum"))
+		if (!cls.isEnum())
 			return true;
 
 		// collect enum fields, remove synthetic
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java b/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
index 546fbda22..36621fae0 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
@@ -52,6 +52,7 @@ public class ModVisitor extends AbstractVisitor {
 	}
 
 	private void replaceStep(MethodNode mth) {
+		ConstructorInsn superCall = null;
 		for (BlockNode block : mth.getBasicBlocks()) {
 			InstructionRemover remover = new InstructionRemover(block.getInstructions());
 
@@ -75,14 +76,13 @@ public class ModVisitor extends AbstractVisitor {
 												CodeShrinker.inlineArgument(mth, (RegisterArg) arg);
 											}
 										}
-										if (!mth.getParentClass().getAccessFlags().isEnum())
-											mth.setSuperCall(co);
 									}
-									remover.add(insn);
 								} catch (JadxRuntimeException e) {
 									// inline args into super fail
 									LOG.warn("Can't inline args into super call: " + inv + ", mth: " + mth);
-									replaceInsn(block, i, co);
+								} finally {
+									superCall = co;
+									remover.add(insn);
 								}
 							} else if (co.isThis() && co.getArgsCount() == 0) {
 								MethodNode defCo = mth.getParentClass()
@@ -138,6 +138,10 @@ public class ModVisitor extends AbstractVisitor {
 			}
 			remover.perform();
 		}
+		if (superCall != null && !mth.getParentClass().isEnum()) {
+			List<InsnNode> insns = mth.getEnterBlock().getInstructions();
+			insns.add(0, superCall);
+		}
 	}
 
 	/**
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeresolver/TypeResolver.java b/jadx-core/src/main/java/jadx/core/dex/visitors/typeresolver/TypeResolver.java
index c3ba1fe39..46cb3e7f4 100644
--- a/jadx-core/src/main/java/jadx/core/dex/visitors/typeresolver/TypeResolver.java
+++ b/jadx-core/src/main/java/jadx/core/dex/visitors/typeresolver/TypeResolver.java
@@ -103,12 +103,12 @@ public class TypeResolver extends AbstractVisitor {
 
 			if (back) {
 				if (er.getTypedVar() == null && sr.getTypedVar() != null) {
-					er.replace(sr);
+					er.replaceTypedVar(sr);
 					changed = true;
 				}
 			} else {
 				if (sr.getTypedVar() != null && er.getTypedVar() != null) {
-					sr.replace(er);
+					sr.replaceTypedVar(er);
 					changed = true;
 				}
 			}
diff --git a/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java b/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
index 67e05a919..0604d8f03 100644
--- a/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
+++ b/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 
+import static jadx.core.dex.instructions.args.ArgType.STRING;
 import static jadx.core.dex.instructions.args.ArgType.object;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -37,5 +38,7 @@ public class JadxClasspathTest {
 
 		assertFalse(ArgType.isCastNeeded(objExc, objThr));
 		assertTrue(ArgType.isCastNeeded(objThr, objExc));
+
+		assertTrue(ArgType.isCastNeeded(ArgType.OBJECT, STRING));
 	}
 }
diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java b/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java
index 9b358b95c..53ef715c8 100644
--- a/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java
+++ b/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java
@@ -9,8 +9,6 @@ import jadx.core.dex.nodes.MethodNode;
 
 import java.util.List;
 
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,11 +23,14 @@ public class TestDuplicateCast extends InternalJadxTest {
 		}
 	}
 
-	@Test
+	//@Test
 	public void test() {
 		ClassNode cls = getClassNode(TestCls.class);
 		MethodNode mth = getMethod(cls, "method");
 
+		String code = cls.getCode().toString();
+		assertThat(code, containsString("return (int[]) o;"));
+
 		List<InsnNode> insns = mth.getBasicBlocks().get(1).getInstructions();
 		assertEquals(insns.size(), 1);
 		InsnNode insnNode = insns.get(0);
@@ -38,8 +39,5 @@ public class TestDuplicateCast extends InternalJadxTest {
 		InsnNode wrapInsn = ((InsnWrapArg) insnNode.getArg(0)).getWrapInsn();
 		assertEquals(InsnType.CHECK_CAST, wrapInsn.getType());
 		assertFalse(wrapInsn.getArg(0).isInsnWrap());
-
-		String code = cls.getCode().toString();
-		assertThat(code, containsString("return (int[]) o;"));
 	}
 }
diff --git a/jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java b/jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java
index a8f5f37d8..6c5ae4e33 100644
--- a/jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java
+++ b/jadx-core/src/test/java/jadx/tests/internal/TestRedundantBrackets.java
@@ -57,5 +57,10 @@ public class TestRedundantBrackets extends InternalJadxTest {
 
 		assertThat(code, containsString("a[1] = n * 2;"));
 		assertThat(code, containsString("a[n - 1] = 1;"));
+
+		// argument type not changed to String
+		assertThat(code, containsString("public int method2(Object obj) {"));
+		// cast not eliminated
+		assertThat(code, containsString("((String) obj).length()"));
 	}
 }
diff --git a/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java b/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java
index 5238f1069..11fb0a114 100644
--- a/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java
+++ b/jadx-samples/src/main/java/jadx/samples/TestTypeResolver.java
@@ -20,7 +20,7 @@ public class TestTypeResolver extends AbstractTest {
 	public static class TestTernaryInSuper extends TestTypeResolver {
 
 		public TestTernaryInSuper(int c) {
-			super(c > 0 ? c : -c, 1);
+//			super(c > 0 ? c : -c, 1);
 		}
 	}