Fix for Windows, Python 2 and a regression note