Minor Win conf changes
Merge