Fixed annoying pop-ups