Fixes to popovers.