fixed a few popups