Fixed some errors with MTM extensions