Minor esthetic fixes