Improvements for windows platform