Alert times fixes