Fix the helm issues.