More windows install script fixes