Corrections in helpers