#2863: Aesthetic changes