Fix vcredist restarting PC
Update for Gehn 17