[PATCH] I2O: Bugfixes to get I2O working again