Mirroring fixes.
Merge pull request #724 from jcushman/mirroring

Mirroring fixes.