Fixes to Supertab auto completion