Fixups for TLW-Mary