Backport fixes for rest of cleave templates