fixes to popups