Windows Optris improvements