more migration to using URI instead of IRI, still broken build right now