more migration fixes. yay