Fixed some folding issues.