Fixes marshalling for schemas.