Improvements to alerts