more migration fixes