matrix fixes for index view

Just small fixes.