Changes to enable mapi ziggy to work in Windows