Some fixes in SmartTab