Update API for 4.1 popover changes.