Tweaks to print methods