Fix more windows path problems

Some more fixes here for Windows