Fixes for tooltip trigger