Fixups for Tabbed pane