More adjustments to default.xml