Tweaks to work with multiple viz versions.