Improve Windows support