A couple of small fixups.