More helm tweaking