Fix a few piping and area issues.