More messaging updates for #574