fix alert issues