Fixed jarring recent runs and fallout from angular upgrade.