Fixup MDC and initialization