a few more windows fixes.