fixed issues to migration