diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset
index 94bee4e50..255471a5f 100644
Binary files a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset and b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/BP_OpenDriveToMap.uasset differ
diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset
index 0e6e56b65..548e86b22 100644
Binary files a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset and b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/OnroadMapGenerator/Blueprints/BP_BuildingGenerator.uasset differ
diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py
index e68a03b11..d0ae1126b 100644
--- a/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py
+++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Content/Python/generate_tile.py
@@ -30,9 +30,10 @@ if os.name == "nt":
     editor_path = "%s/Engine/Binaries/%s/UE4Editor" % (ue4_path, sys_name)
     command = [editor_path, uproject_path, run]
     command.extend(arguments)
+    full_command = editor_path + " " + uproject_path + " " + run + " " + arguments
     print("Commandlet:", command)
     print("Arguments:", arguments)
-    subprocess.check_call(command, shell=True)
+    subprocess.check_call(full_command, shell=True)
 elif os.name == "posix":
     sys_name = "Linux"
     editor_path = "%s/Engine/Binaries/%s/UE4Editor" % (ue4_path, sys_name)
diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
index a3049125b..42daea10d 100644
--- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
+++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
@@ -293,11 +293,13 @@ AActor* UOpenDriveToMap::SpawnActorWithCheckNoCollisions(UClass* ActorClassToSpa
 void UOpenDriveToMap::GenerateTileStandalone(){
   UE_LOG(LogCarlaToolsMapGenerator, Log, TEXT("UOpenDriveToMap::GenerateTileStandalone Function called"));
 
+#if PLATFORM_WINDOWS
+  GenerateTile();
+#else
   ExecuteTileCommandlet();
-
+#endif
   UEditorLoadingAndSavingUtils::SaveDirtyPackages(true, true);
   UEditorLevelLibrary::SaveCurrentLevel();
-
 }
 
 void UOpenDriveToMap::GenerateTile(){
diff --git a/Util/BuildTools/BuildPythonAPI.sh b/Util/BuildTools/BuildPythonAPI.sh
index 8a46145de..f5bbb5c61 100755
--- a/Util/BuildTools/BuildPythonAPI.sh
+++ b/Util/BuildTools/BuildPythonAPI.sh
@@ -105,7 +105,7 @@ if ${BUILD_PYTHONAPI} ; then
       cp dist/.tmp/$(ls dist/.tmp | grep .whl) dist
     else
       /usr/bin/env python${PY_VERSION} setup.py bdist_egg bdist_wheel --dist-dir dist/.tmp --plat ${TARGET_WHEEL_PLATFORM}
-      /usr/bin/env python3 -m auditwheel repair --plat ${TARGET_WHEEL_PLATFORM} --wheel-dir dist dist/.tmp/$(ls dist/.tmp | grep .whl)
+      /usr/bin/env python${PY_VERSION} -m auditwheel repair --plat ${TARGET_WHEEL_PLATFORM} --wheel-dir dist dist/.tmp/$(ls dist/.tmp | grep .whl)
     fi
 
     rm -rf dist/.tmp
diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
index 64774d017..f68dd378f 100755
--- a/Util/BuildTools/Setup.sh
+++ b/Util/BuildTools/Setup.sh
@@ -761,7 +761,7 @@ cp -p ${PROJ_SERVER_LIB} ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
 # -- Get and compile patchelf --------------------------------------------------
 # ==============================================================================
 
-PATCHELF_VERSION=0.12
+PATCHELF_VERSION=0.14
 PATCHELF_REPO=https://github.com/NixOS/patchelf/archive/${PATCHELF_VERSION}.tar.gz
 
 PATCHELF_TAR=${PATCHELF_VERSION}.tar.gz