Add recent bug fixes for Tabs