Fixed merge with master overwritting windows fixes