mirror bug fixes