Improve M$ Windows compatibility