Sort out some MT issues, examples fixup