More fold related changes.