Alert improvments