fixed path handling for windows

I updated from my older cleaver 0.4.x to 0.5.1 on my windows workstation but afterwards cleaver didn't work because of the way paths get concatenated. 

While fixing that I found 2 other places that need a small change to work on windows.