[helpers] - tweak helpers