This by itself fixed the issue for me on Windows. Not sure what the reason is for the other changes.