More changes due to core & mirror API evolution. Runs again.