AD2: Clean Up A Few Bugs With MHT Definitions