Minor tweaks for easier interactive use.