Three more migration fixes