fixups for master of #4789