Fix Windows issues