Fixes from Geoff Burling <llywrch@agora.rdrop.com>
Fixes from Geoff Burling <llywrch@agora.rdrop.com>

born2late/afterstep-devel,born2late/afterstep-devel,born2late/afterstep-devel,born2late/afterstep-devel,born2late/afterstep-devel