Some minor fixups