Some minor fixup