mt fixups

Change-Id: Ibfc8fb431493aa2cb8cf081e74b16d0791d3986c