Fixes for tab completion