Some windows changes
Merged