Tabs and support library fix.