Fixed some win32 breakages.