Fixups for TLW-1816 up to p. viii