1.1.x windows compatibility patches (issue #15)

Reported by @milesj in #15