Windows bugs really and truly squashed (really fixes #2)