Fix variables from Questionnaire