Small cleanup and helm support.