[MPT fixes & ADT menu options]