Validation and schema fixes