Fixed install/upgrade in Windows, polished