Version update and win32 tweaks