(Partial commit) Work through some schema validation issues