More fixing of the broken handlers