Schema validation fixes