Minor fixes to IOC