A few fixups.