popover fixes