Fixed two bugs in CommandToolTip