Various minor fixups