Windows release fixes