Adding fixes to Windows installer