Minor tweaks to console programs