Billy Biggs <vektor@dumbterm.net>

Thanks to:

  Douglas Pollock <douglas.pollock@magma.ca>
    - Fix for some BadWindow errors.