More tooltip fixes