Even more winfixes