More Windows support fixes