Adjust base.repair to new modules