minor tweaks missed in last commit