More work on windows port.