Minor tweaks per Pippin