fixes in alerts