Fix warning and alert features