Windows fixes

Here are some changes I have made. With these in place, I can run all the MPs on my windows machine (although I confess that I was developing against the hetero13 repo until recent, and didn't really try against this repo)