Fixes to pop-ups.