More Embedded Composer changes.