fixes on alert messages