Small fixups.