Fix Windows 7 Crashes

Fix Windows 7 Crashes