More tool tip fixes