Fix issue with overlap in project products & components.