Yet more little tweaks.