More fixup on P09.