More popups fixes