Quiz fixes