Drafts and validation fixes