Minor output improvements