further windows specific changes