Fixes for tooltips