Multiple pop up fixes