Minor tweaks for the new code.