Fix helpers, tweak hero strategy