fixes to yes/no requirement support