Mirror Selection fixes