Fix some sku generation issues relation to collection refactoring