all/new: minor changes to support windows.