Some improvements in alerts system.