Fixes for subcomponent table.