Fixes to alert messages