ToolTips issues and fixes samples