Mirroring fixes

More fixes to mirroring

Don't merge yet