Fixed some issues with IRI class.