Windows fixes.
Merge branch 'master' of github.com:Rendaw/ren-tupsupport