Fixes to make Windows setup work