Minor fixes at helpers