Minor output modifications