Cosmetic changes to server output