Fix popover issues