Some questioner tweaks