Further fixes to get PySpark to work on Windows