Small output format changes