Fixed annoying alerts