Some commits that fix building of spotify resolver in Windoze