More MITM changes