Tweaked a couple of the new Shivan primaries.