Added MDN related fixes