Fixes in the resolver and booter on Windows - both for development and distro