Fixing some first-time popups