Fix a couple of DI things