more migration fixing