Some more adjustments