Minor mods to allow NoTrendFollowing