Some fixes for FastI2I