Stability improvements for Win dist.