Fix default answer and forgotten mandatory