Some fixes to supertab behavior