Fixes for the mirroring.