Few windows env fixes