Small improvements to the folding pipeline

Improve the folding pipeline to make it easier to use and to avoid errors.

Signed-off-by: Walter Lozano walter.lozano@collabora.com