Further tweaks