more popup fixes