corrections to handlers in various places