Fix potentially missing messages