Output formatting fixes