Fixes Product Builder compatibility with ODM