Tweaks to IoC