More tooltip tweaks