various tweaks to make ci target work on Windows