Fixed issues with recent helper changes.