More Windows changes that didn't make it in before.