Fix DI-related mimification issues.