Minor fixups