Additional windows fix...