Fixes to installer for Windows7 64bit