more adjustments to gitian-win