Tooltip and tracking code fixes.