Fix helpers based on HS:Note build out