Popovers fix in demos