Fix Windows 7 Errors