Some TWI fixes