DI tweaks, this is waiting on some phpioc upgrades.