Windows support fixes.