Fixed Popover issues