Fix window numbering.