some fixes related to mt