fixup a couple of things that got munged in recent merge