More output tweaks