Fixing popover problems