diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java
index 23f172b07..f7d2ff71a 100644
--- a/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java
+++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java
@@ -166,7 +166,7 @@ public class BreakpointManager {
 
 		@Override
 		public int hashCode() {
-			return (int) (31 * codeOffset + 31 * cls.hashCode() + 31 * mth.hashCode());
+			return Objects.hash(codeOffset, cls, mth);
 		}
 
 		@Override
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java
index a153437d2..a7e1749fa 100644
--- a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java
+++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java
@@ -660,8 +660,8 @@ public class Smali {
 	private void formatByteCode(StringBuilder smali, byte[] bytes) {
 		int maxLen = Math.min(bytes.length, 4 * 2); // limit to 4 units
 		StringBuilder inHex = new StringBuilder();
-		for (int i = 0; i < maxLen; i++) {
-			int temp = ((bytes[i++] & 0xff) << 8) | (bytes[i] & 0xff);
+		for (int i = 0; i < maxLen - 1; i += 2) {
+			int temp = ((bytes[i] & 0xff) << 8) | (bytes[i + 1] & 0xff);
 			inHex.append(String.format("%04x ", temp));
 		}
 		smali.append(String.format(FMT_BYTECODE_COL, inHex));