Minor mods to output.