Mods to make it work in Windows with latest versions