Updates to match latest mirror API. Untested.