More view and index adjustments