Messaging channel fixes.