DDL fix, and make mco 2 compatible