Resync schema, some leftovers from 57

Not sure how these were missed, but they are harmless and idempotent