Yet more corrections and additions to helpers

Signed-off-by: Ilya Mikhaltsou <morpheby@gmail.com>