Fixups as suggested on GH.