e610: mdpi fixes

Change-Id: I21aacdb01bf3ffdba475a34f8397bffae4ea3f00