Fix issues in the helpers