Fixes in popovers