Tweaks to listing output