windows performance fix
Merge fixes