Mirror fix and update