fixes for new helpers scheme