Inconsistent messaging delivery

Other Upward issues: