Merge pull request #1300 from timw4mail/patch

Fix rest of the helpers