Bugfix SVIs - still need to fix tests.