diff --git a/python/helpers/pydev/build.gradle b/python/helpers/pydev/build.gradle
index 93e68d52c134..d33613333f34 100644
--- a/python/helpers/pydev/build.gradle
+++ b/python/helpers/pydev/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 envs {
+  project.buildDir = new File(System.getenv().getOrDefault("PYCHARM_BUILD_DIR", buildDir))
   bootstrapDirectory = new File(buildDir, '.miniconda')
   envsDirectory = new File(buildDir, 'MinicondaEnvs')
   minicondaVersion = 'latest'
diff --git a/python/helpers/pydev/setup_cython.py b/python/helpers/pydev/setup_cython.py
index 66341fbdb646..b648688400eb 100644
--- a/python/helpers/pydev/setup_cython.py
+++ b/python/helpers/pydev/setup_cython.py
@@ -21,13 +21,13 @@ def process_args():
     force_cython = False
     for i, arg in enumerate(sys.argv[:]):
         if arg.startswith('--target-pyd-name='):
-            del sys.argv[i]
+            sys.argv.remove(arg)
             target_pydevd_name = arg[len('--target-pyd-name='):]
         if arg.startswith('--target-pyd-frame-eval='):
-            del sys.argv[i]
+            sys.argv.remove(arg)
             target_frame_eval = arg[len('--target-pyd-frame-eval='):]
         if arg == '--force-cython':
-            del sys.argv[i]
+            sys.argv.remove(arg)
             force_cython = True
 
     return target_pydevd_name, target_frame_eval, force_cython