Traditional builder: Windows fixes