More output improvements.