Small corrections in the handlers