More bug fixes to Compose Message workflow.