a couple more migration fixes