Fix rest of the helpers
11 files changed