Schema Fixes

- fixes of schemas