Made tooltips more robust