Minor esthetic improvements