Fixing noun issues.