More Windows fixes.