Some minor setting re-adjustments.