MSWin Fixes

Conflicts:
	configure