Aesthetic fixes