Final fixes of helper