Simplify build, and make sure installer works on Windows 8