Fix Windows support
Fix Windows support more