Products preprocess fixes