Batch of mirror fixes