Even more windows fixes