[PATCH] IOC3 fixes