IOC plugin fixes