Fix collection relationship resolution.