Fixes the RDT issues and the a broken dmend2end test