Add fixes to the win scanner