More functional issues.
5 files changed