schema definitions fixes