Getting things working on Windows again