[windows] first pass fixes