couple of minor things while investigating #868