More MT fixes