try to fix some migrate issues