fix feedback for new schema

Should be a much cleaner pull request this time.
Rebase has never done that to me before.