Some more minor adjustments