windows port fixes