Popup policy updates

I noticed that the popup policy wasn't working, so I investigated and fixed a couple of other issues while in there.