Bug fixes for TabContainer