Fixes to alerts