Fixes to component views.