[Bug 23913]: [Shadow] Fix editorial issues.