Fixing more fallout from the addition of the schema.