Make some additional changes to troubleshoot notifications