Windows port fixes