Jdmundrawala/11 windows env fix