Some minor fixups.