Output tweaks and fixes