Windows fixes

Oops was on a branch back to master