Another round of tooltip fix-ups