Some fixes when creating quiz