PopUp-related fixes