Question type fixes