more fixes to questions raised during PR review