Fix some too strict validation schemes