A few more adjustments