[tz] [PATCH] Fixups for today’s patches