Popover fixes