Window, fixes