more migration bugs