Corrections in the handler module