Rebuild for Windows 7