Windower fixes