Small windows fix