Mirror management (again)