Some tweaking to get the thread quiz working