Fix two bugs in new write-one-question code