Improvement to OverlayTrigger

Two small fixes for manual OverlayTrigger use.