Fix delay messages