Small further tweaks