some fixes on helpers