A few more esthetic fixes