Adjustments to default values