two tweaks required to fix up previous commit