Fix more windows path problems