Fix ProductSpec which was broken due to refactoring.