More windows fix