A few more Schema -> *Schema type changes