improve Windows support