Fix defects that resulted in the order of items in the processing pipeline to be changed.