Fixex in migration, tpls