Fixes to supertab