fixes for windows platform