diff --git a/build_and_test.sh b/build_and_test.sh
index 8e742ea..4ce82b9 100755
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -e
 
+# Clean up any previous generated test files.
+rm -rf tests/py/__pycache__
+
 cd src
 ./build.sh
 cd ..
@@ -10,3 +13,6 @@ pip3 install -r requirements_dev.txt
 pip3 install src/dist/* --force-reinstall
 python3 -m pytest tests/py
 deactivate
+
+# Clean up any generated test files.
+rm -rf tests/py/__pycache__
diff --git a/src/build-wheels.sh b/src/build-wheels.sh
index 1e4a0c6..8477d84 100755
--- a/src/build-wheels.sh
+++ b/src/build-wheels.sh
@@ -10,8 +10,14 @@ ROOT=$(cd $(dirname "${BASH_SOURCE[0]}") >/dev/null; /bin/pwd -P)
 # Parallelize the build over N threads where N is the number of cores * 1.5.
 PARALLEL_BUILD_OPTION="-j $(($(nproc 2> /dev/null || echo 4)*3/2))"
 
-# Clean up any previous build files.
-rm -rf ${ROOT}/build ${ROOT}/dist ${ROOT}/setup.cfg
+# Clean up any previous build/test files.
+rm -rf \
+  ${ROOT}/build \
+  ${ROOT}/dist \
+  ${ROOT}/setup.cfg \
+  ${ROOT}/google_python_cloud_debugger.egg-info \
+  /io/dist \
+  /io/tests/py/__pycache__
 
 # Create directory for third-party libraries.
 mkdir -p ${ROOT}/build/third_party
@@ -78,6 +84,11 @@ done
 popd
 
 # Clean up temporary directories.
-rm -rf ${ROOT}/build ${ROOT}/setup.cfg
+rm -rf \
+  ${ROOT}/build \
+  ${ROOT}/setup.cfg \
+  ${ROOT}/google_python_cloud_debugger.egg-info \
+  /io/tests/py/__pycache__
+
 echo "Build artifacts are in the dist directory"
 
diff --git a/src/build.sh b/src/build.sh
index ba9a944..f61ef2f 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -42,7 +42,11 @@ ROOT=$(cd $(dirname "${BASH_SOURCE[0]}") >/dev/null; /bin/pwd -P)
 PARALLEL_BUILD_OPTION="-j $(($(nproc 2> /dev/null || echo 4)*3/2))"
 
 # Clean up any previous build files.
-rm -rf ${ROOT}/build ${ROOT}/dist ${ROOT}/setup.cfg
+rm -rf \
+  ${ROOT}/build \
+  ${ROOT}/dist \
+  ${ROOT}/setup.cfg \
+  ${ROOT}/google_python_cloud_debugger.egg-info
 
 # Create directory for third-party libraries.
 mkdir -p ${ROOT}/build/third_party
@@ -91,3 +95,8 @@ pushd ${ROOT}
 "${PYTHON:-python3}" -m pip wheel . --no-deps -w dist
 popd
 
+# Clean up temporary directories.
+rm -rf \
+  ${ROOT}/build \
+  ${ROOT}/setup.cfg \
+  ${ROOT}/google_python_cloud_debugger.egg-info
diff --git a/src/googleclouddebugger/bytecode_manipulator.cc b/src/googleclouddebugger/bytecode_manipulator.cc
index 3c95edd..44cef74 100644
--- a/src/googleclouddebugger/bytecode_manipulator.cc
+++ b/src/googleclouddebugger/bytecode_manipulator.cc
@@ -132,6 +132,9 @@ static PythonOpcodeType GetOpcodeType(uint8_t opcode) {
 #if PY_VERSION_HEX < 0x03080000
     // Removed in Python 3.8.
     case CONTINUE_LOOP:
+#endif
+#if PY_VERSION_HEX >= 0x03090000
+    case JUMP_IF_NOT_EXC_MATCH:
 #endif
       return BRANCH_ABSOLUTE_OPCODE;
 
@@ -144,10 +147,18 @@ static PythonOpcodeType GetOpcodeType(uint8_t opcode) {
 static int GetBranchTarget(int offset, PythonInstruction instruction) {
   switch (GetOpcodeType(instruction.opcode)) {
     case BRANCH_DELTA_OPCODE:
+#if PY_VERSION_HEX < 0x030A0000
       return offset + instruction.size + instruction.argument;
+#else
+      return offset + instruction.size + instruction.argument * 2;
+#endif
 
     case BRANCH_ABSOLUTE_OPCODE:
+#if PY_VERSION_HEX < 0x030A0000
       return instruction.argument;
+#else
+      return instruction.argument * 2;
+#endif
 
     default:
       DCHECK(false) << "Not a branch instruction";
@@ -428,13 +439,21 @@ static bool InsertAndUpdateBranchInstructions(
         // argument of 0 even when it is not required. This needs to be taken
         // into account when calculating the target of a branch instruction.
         int inst_size = std::max(instruction.size, it->original_size);
+#if PY_VERSION_HEX < 0x030A0000
         int32_t target = it->current_offset + inst_size + arg;
+#else
+        int32_t target = it->current_offset + inst_size + arg * 2;
+#endif
         need_to_update = it->current_offset < insertion.current_offset &&
                          insertion.current_offset < target;
       } else if (opcode_type == BRANCH_ABSOLUTE_OPCODE) {
         // For absolute branches, the argument needs to be updated if the
         // insertion before the target.
+#if PY_VERSION_HEX < 0x030A0000
         need_to_update = insertion.current_offset < arg;
+#else
+        need_to_update = insertion.current_offset < arg * 2;
+#endif
       }
 
       // If we are inserting the original method call instructions, we want to
diff --git a/src/googleclouddebugger/version.py b/src/googleclouddebugger/version.py
index 5c21bc2..0f8f662 100644
--- a/src/googleclouddebugger/version.py
+++ b/src/googleclouddebugger/version.py
@@ -4,4 +4,4 @@
 # The major version should only change on breaking changes. Minor version
 # changes go between regular updates. Instances running debuggers with
 # different major versions will show up as two different debuggees.
-__version__ = '3.4'
+__version__ = '3.5'