Pop up fixes