cmake: More windows fixes5