BW_preprocess bug fixes