Validation fixes