Fix mode name
Speed up helm