A smidge more metadata/schema adjustment