Misceallenous Win32 build related fixes