diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
index 714df09e..ce277d2f 100644
--- a/app/src/main/java/com/termux/app/TermuxInstaller.java
+++ b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -110,6 +110,7 @@ final class TermuxInstaller {
 											outStream.write(buffer, 0, readBytes);
 									}
 									if (zipEntryName.startsWith("bin/") || zipEntryName.startsWith("libexec") || zipEntryName.startsWith("lib/apt/methods")) {
+										//noinspection OctalInteger
 										Os.chmod(targetFile.getAbsolutePath(), 0700);
 									}
 								}
diff --git a/app/src/main/java/com/termux/terminal/TerminalEmulator.java b/app/src/main/java/com/termux/terminal/TerminalEmulator.java
index 96e2e89d..92de6c96 100644
--- a/app/src/main/java/com/termux/terminal/TerminalEmulator.java
+++ b/app/src/main/java/com/termux/terminal/TerminalEmulator.java
@@ -1738,7 +1738,7 @@ public final class TerminalEmulator {
 		default:
 			// The ESC character was not followed by a \, so insert the ESC and
 			// the current character in arg buffer.
-			collectOSCArgs((byte) 033);
+			collectOSCArgs(27);
 			collectOSCArgs(b);
 			continueSequence(ESC_OSC);
 			break;
diff --git a/app/src/test/java/com/termux/terminal/KeyHandlerTest.java b/app/src/test/java/com/termux/terminal/KeyHandlerTest.java
index f50da632..6bb15a80 100644
--- a/app/src/test/java/com/termux/terminal/KeyHandlerTest.java
+++ b/app/src/test/java/com/termux/terminal/KeyHandlerTest.java
@@ -12,7 +12,8 @@ public class KeyHandlerTest extends TestCase {
 			if (buffer.length() > 0) {
 				buffer.append(" ");
 			}
-			buffer.append("0x" + Integer.toHexString(s.charAt(i)));
+			buffer.append("0x");
+			buffer.append(Integer.toHexString(s.charAt(i)));
 		}
 		return buffer.toString();
 	}
diff --git a/app/src/test/java/com/termux/terminal/TerminalRowTest.java b/app/src/test/java/com/termux/terminal/TerminalRowTest.java
index d699a38e..45d51262 100644
--- a/app/src/test/java/com/termux/terminal/TerminalRowTest.java
+++ b/app/src/test/java/com/termux/terminal/TerminalRowTest.java
@@ -1,6 +1,7 @@
 package com.termux.terminal;
 
 import java.util.Arrays;
+import java.util.Random;
 
 import junit.framework.TestCase;
 
@@ -99,9 +100,10 @@ public class TerminalRowTest extends TestCase {
 
 		char[] rawLine = new char[80];
 		Arrays.fill(rawLine, ' ');
+		Random random = new Random();
 		for (int i = 0; i < 1000; i++) {
-			int lineIndex = (int) Math.random() * rawLine.length;
-			int charIndex = (int) Math.random() * someChars.length;
+			int lineIndex = random.nextInt(rawLine.length);
+			int charIndex = random.nextInt(someChars.length);
 			rawLine[lineIndex] = someChars[charIndex];
 			row.setChar(lineIndex, someChars[charIndex], 0);
 		}